Michael Niedermayer
fe25194c58
Merge commit 'c201069fac9a76e6604f9d84d76a172434d62200'
...
* commit 'c201069fac9a76e6604f9d84d76a172434d62200':
avdevice: Add missing header for NULL_IF_CONFIG_SMALL
Conflicts:
libavdevice/alsa-audio-dec.c
libavdevice/alsa-audio-enc.c
libavdevice/pulse_audio_dec.c
libavdevice/sndio_enc.c
libavdevice/vfwcap.c
libavdevice/x11grab.c
libavdevice/xcbgrab.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
71288bf80f
Merge commit '27852f2f1dec3749ea79883b70484c841169f747'
...
* commit '27852f2f1dec3749ea79883b70484c841169f747':
libavformat: Handle error return from ff_listen_bind
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
7ef59803e8
Merge commit '0266988ccd15436eaf5f7bb6f9509e6bfd5ce589'
...
* commit '0266988ccd15436eaf5f7bb6f9509e6bfd5ce589':
hqx: Fix clipping error in idct put function
See: 92f94fd5dd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
e77270cd93
Merge commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d'
...
* commit '783df7d5c5ab15f3d1afe2541c7d461c81c5c29d':
riff: Add 'M705' FourCC for mpeg2video
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
72a580268f
Merge commit '5980c924e309ae1dde8bd52d9938f94ff02602eb'
...
* commit '5980c924e309ae1dde8bd52d9938f94ff02602eb':
dnxhd: Log the selected profile id
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
98c7d305a7
Merge commit 'be089af38f65dc8b1fe3564f98020fc815577edb'
...
* commit 'be089af38f65dc8b1fe3564f98020fc815577edb':
mov: Rely on box type rather than file type for colr atom
Conflicts:
libavformat/mov.c
See: 0276b95242
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
9fd3d9acf7
Merge commit 'f8fd0c29ce5dc7d4be13e7e89d0f1e8a035ae71b'
...
* commit 'f8fd0c29ce5dc7d4be13e7e89d0f1e8a035ae71b':
v210: Fix typo in header guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Timo Rothenpieler
7b0689c55f
avcodec/nvenc: Add options for level and tier
...
Previous version reviewed-by: Philip Langdale <philipl@overt.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
7be2d2a70c
avcodec/h264: Use only one ERContext
...
This fixes slice threads with error concealment
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Diego Biurrun
8d26c193fb
avdevice: Apply a more consistent file naming scheme
10 years ago
Diego Biurrun
c201069fac
avdevice: Add missing header for NULL_IF_CONFIG_SMALL
...
Also reshuffle headers into canonical order where appropriate.
10 years ago
Anders Nystrom
27852f2f1d
libavformat: Handle error return from ff_listen_bind
...
Handle error return from ff_listen_bind without leaking file descriptors.
Signed-off-by: Anders Nystrom <anders.nystrom@southpole.se>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
10 years ago
Ferdinand Oeinck
0266988ccd
hqx: Fix clipping error in idct put function
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
10 years ago
Vittorio Giovara
783df7d5c5
riff: Add 'M705' FourCC for mpeg2video
10 years ago
Vittorio Giovara
5980c924e3
dnxhd: Log the selected profile id
10 years ago
Michael Niedermayer
98d0c4236c
avcodec/h264: Be more tolerant to changing pps id between slices
...
Fixes Ticket4446
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Vittorio Giovara
be089af38f
mov: Rely on box type rather than file type for colr atom
...
Although it's not allowed to use only allows 'nclc' in ISOM files, there
are samples that do not always respect this rule. This change prevents
atom overread and a spurious color range initialization.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
10 years ago
Vittorio Giovara
f8fd0c29ce
v210: Fix typo in header guards
10 years ago
Michael Niedermayer
0773f67395
avfilter/vsrc_life: Fix mix of declarations and statements
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Himangi Saraogi
df4fca2163
vda: Cast to not discard constant qualifier and silence compiler warning
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
d630f38f47
avutil/x86/Makefile: fix conditional x86/emms.o build
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
e88b3852ae
avcodec/aacdec: Fix storing state before PCE decode
...
Fixes Ticket4460
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
32e06c485b
avcodec/h264_ps: Move truncation check from VUI to SPS
...
This more completely checks for truncation
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
wm4
48f27b78f4
microdvd: do not export framerate hint as subtitle packet
...
MicroDVD has a "hack" for specifying the video framerate the subtitle
was authored against. The demuxer reads this hint correctly, but didn't
skip it correctly.
This was not noticed, because the exported packet has its duration set
to 0, making it invisible (depending on the API user's rendering logic).
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
edaca0812a
Merge commit 'bb815dfc38b8ef7a89d6b9684ce0cdc296385d6d'
...
* commit 'bb815dfc38b8ef7a89d6b9684ce0cdc296385d6d':
g2meet: K&R formatting cosmetics
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
8e1717cf12
Merge commit 'c4d37cd9ef6e374bb888f6273259b10fac5bd909'
...
* commit 'c4d37cd9ef6e374bb888f6273259b10fac5bd909':
matroskadec: export cover art correctly
Conflicts:
libavformat/matroskadec.c
See: 511585ce7f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Carl Eugen Hoyos
79c11388e1
lavf/apngenc: Do not print a warning in the normal use-case.
10 years ago
Ronald S. Bultje
b926f02e81
avutil/x86/Makefile: Make building and linking of emms.c conditional
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Paul B Mahol
a0854c084e
avfilter: handle error in query_formats() in bunch of filters
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
10 years ago
Gilles Chanteperdrix
21e034a47a
avformat/libquvi: Fix whitelist handling
...
Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Diego Biurrun
bb815dfc38
g2meet: K&R formatting cosmetics
10 years ago
Michael Niedermayer
845ab37b05
avcodec/h264_slice: Fix uninitialized variable
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
wm4
c4d37cd9ef
matroskadec: export cover art correctly
...
Generally, libavformat exports cover art pictures as video streams with
1 packet and AV_DISPOSITION_ATTACHED_PIC set. Only matroskadec exported
it as attachment with codec_id set to AV_CODEC_ID_MJPEG.
Obviously, this should be consistent, so change the Matroska demuxer to
export a AV_DISPOSITION_ATTACHED_PIC pseudo video stream.
Matroska muxing is probably incorrect too. I know that it can create
broken files with an audio track and just 1 video frame when e.g.
remuxing mp3 with APIC to mkv. But for now this commit does not change
anything about muxing, and also continues to write attachments with
AV_CODEC_ID_MJPEG should the muxer application have special knowledge
that the Matroska is broken in this way.
Signed-off-by: Anton Khirnov <anton@khirnov.net>
10 years ago
Michael Niedermayer
386601286f
avcodec/h264_slice: Dont reset mb_aff_frame per slice
...
Fixes null pointer dereference
Fixes Ticket4440
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
795199fca4
avcodec/h264: use consistent argument name in MB_FIELD() macro
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
ferdo@bigroses.nl
92f94fd5dd
libavcodec/hqx: correct clipping error
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
235589ee9e
avformat/segment: Change enum to int, which is accessed via AVOption as int
...
This fixes depending on implementation defined behavior
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
f289422a3e
avformat/ape: Use av_malloc_array()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
3662e251cb
avformat/asfenc: Check for index_ptr allocation failure
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Vignesh Venkatasubramanian
d6bb82387c
webmdashenc: Fix fate in MSVC
...
MSVC does not support the %F and %T format specifiers in strftime.
Replace that with the expanded version. This fixes the broken fate
tests in MSVC (webm-dash-manifest-*).
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
9c37c81246
Merge commit '27f274628234c1f934b9a6a6380ed567c1b4ceae'
...
* commit '27f274628234c1f934b9a6a6380ed567c1b4ceae':
parseutils: Make av_small_strptime public
Conflicts:
doc/APIchanges
libavformat/utils.c
libavutil/parseutils.c
libavutil/version.h
See: 29e972f67c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
0739179bfb
Merge commit '108f2f381acb93827fb4add0517eeae859afa3bf'
...
* commit '108f2f381acb93827fb4add0517eeae859afa3bf':
parseutils: Extend small_strptime to be used in avformat
Conflicts:
libavutil/parseutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Vignesh Venkatasubramanian
6fd300ac6c
lavf: Add support for WebM Live Muxing
...
This patch adds support for WebM Live Muxing by adding a new WebM
Chunk muxer. It writes out live WebM Chunks which can be used for
playback using Live DASH Clients.
Please see muxers.texi for sample usage.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Luca Barbato
27f2746282
parseutils: Make av_small_strptime public
...
And use it in libavformat.
Based on a similar patch by Stefano Sabatini <stefasab@gmail.com>.
10 years ago
Michael Niedermayer
c4b2017ba6
avcodec/h264: finish previous slices before switching to single thread mode
...
Fixes null pointer dereference
Fixes Ticket4438
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
43b434210e
avcodec/h264: Fix race between slices where one overwrites data from the next
...
Fixes non deterministic crash in ticket4408/fuzz2.264
Likely fixes other samples as well
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
4ec5762e25
tests/fate/mpeg4: add bitexact flag so as to avoid the version number from being included in the checksum
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Andreas Cadhalpun
1b8d071734
fate: add mpeg4_unpack_bframes bsf test
...
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Stephan Holljes
6d8c27f951
libavformat/http.c: Fix missing parenthesis in http_listen()
...
Signed-off-by: Stephan Holljes <klaxa1337@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago
Michael Niedermayer
eca39e29a3
MAINTAINERS: Add Lou Logan as server admin as he is root too
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
10 years ago