]>
git.sesse.net Git - ffmpeg/log
Benoit Fouet [Fri, 14 Nov 2014 09:17:37 +0000 (10:17 +0100)]
avcodec/pngdec: use else if instead of if for small bpp handling.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Fri, 14 Nov 2014 09:17:36 +0000 (10:17 +0100)]
avcodec/pngdec: fix some indentation/whitespaces
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Fri, 14 Nov 2014 09:17:35 +0000 (10:17 +0100)]
avcodec/pngdec: create a function to decode tRNS chunk.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Fri, 14 Nov 2014 09:17:34 +0000 (10:17 +0100)]
avcodec/pngdec: create a function to decode PLTE chunk.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Fri, 14 Nov 2014 09:17:33 +0000 (10:17 +0100)]
avcodec/pngdec: create a function to decode IDAT chunk.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Fri, 14 Nov 2014 09:17:32 +0000 (10:17 +0100)]
avcodec/pngdec: create a function to decode pHYs chunk.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Fri, 14 Nov 2014 09:17:31 +0000 (10:17 +0100)]
avcodec/pngdec: create a function to decode IHDR chunk.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Benoit Fouet [Fri, 14 Nov 2014 09:17:30 +0000 (10:17 +0100)]
avcodec/pngdec: rename decode_frame to decode_frame_png
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Peter Ross [Thu, 13 Nov 2014 22:14:24 +0000 (09:14 +1100)]
avfilter/vf_lut: gammaval709()
See http://www.itu.int/rec/R-REC-BT.709
Item 1.2, overall opto-electronic transfer characteristics at source
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Clément Bœsch [Mon, 10 Nov 2014 05:43:15 +0000 (06:43 +0100)]
fate: add xBR filter tests
Aleksey Vasenev [Wed, 12 Nov 2014 22:39:45 +0000 (01:39 +0300)]
avfilter/vf_tinterlace: fix frame rate
Signed-off-by: Aleksey Vasenev <margtu-fivt@ya.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Aleksey Vasenev [Wed, 12 Nov 2014 22:38:29 +0000 (01:38 +0300)]
avfilter/vf_interlace: more accurate pts calculation
Signed-off-by: Aleksey Vasenev <margtu-fivt@ya.ru>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Thu, 13 Nov 2014 21:13:33 +0000 (22:13 +0100)]
lavc/flashsv2enc: Fix encoding resolution error message.
Michael Niedermayer [Thu, 13 Nov 2014 19:40:37 +0000 (20:40 +0100)]
avcodec/nellymoserenc: fix sign error
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 18:01:08 +0000 (19:01 +0100)]
avcodec/4xm: remove duplicate assert
Found-by: carl
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 15:03:23 +0000 (16:03 +0100)]
tests/tiny_psnr: remove redundant initialization
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Thu, 13 Nov 2014 16:47:55 +0000 (13:47 -0300)]
x86/flacdsp: add SSE2 and AVX decorrelate functions
Two to four times faster depending on instruction set, block size and channel count.
Peter Ross [Sun, 9 Nov 2014 01:05:41 +0000 (12:05 +1100)]
cinedec: report white balance gain coefficients using metadata
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 14:20:40 +0000 (15:20 +0100)]
Merge commit '
a2448cfe167a4cd4eb631318550d4eef38fca24a '
* commit '
a2448cfe167a4cd4eb631318550d4eef38fca24a ':
jpeg2000: do not compute the same value twice
Conflicts:
libavcodec/jpeg2000.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 13:53:14 +0000 (14:53 +0100)]
Merge commit '
59846452af762f6af5ced4399e8dcd709ca50fcd '
* commit '
59846452af762f6af5ced4399e8dcd709ca50fcd ':
svq1enc: check ff_get_buffer return value
Conflicts:
libavcodec/svq1enc.c
See:
7effc26ba74717bb9c808d96791c7cf98911d1a1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 13:51:16 +0000 (14:51 +0100)]
Merge commit '
994ab1804b8bf532f44876927b07b51f1f63247f '
* commit '
994ab1804b8bf532f44876927b07b51f1f63247f ':
ansi: check ff_set_dimensions return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 13:50:35 +0000 (14:50 +0100)]
Merge commit '
c7384664ba0cbb12d882effafbc6d321ae706cff '
* commit '
c7384664ba0cbb12d882effafbc6d321ae706cff ':
avs: check ff_set_dimensions return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 13:31:14 +0000 (14:31 +0100)]
Merge commit '
2b5c1efa1465d8646f8be525cace7a21404e40ad '
* commit '
2b5c1efa1465d8646f8be525cace7a21404e40ad ':
g2meet: check ff_set_dimensions return value
Conflicts:
libavcodec/g2meet.c
See:
3af9d8269ea2878fb7960ab5ed52f4a75c73e6ec
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 13:29:26 +0000 (14:29 +0100)]
Merge commit '
c6d7c201dfa80502cb6cefbee7dc9160cedb5187 '
* commit '
c6d7c201dfa80502cb6cefbee7dc9160cedb5187 ':
indeo3: check ff_set_dimensions return value
See:
81ed7efbe24ef1b3d98c9e256d2a9332c1797ffd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 13:21:58 +0000 (14:21 +0100)]
Merge commit '
8e104619a627fcf5f4c2bd3c09d0c2d323aae745 '
* commit '
8e104619a627fcf5f4c2bd3c09d0c2d323aae745 ':
shorten: check for return value
Conflicts:
libavcodec/shorten.c
See:
e20ebe491c17388a312e04ff060c217ecfafc914
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 13:11:46 +0000 (14:11 +0100)]
Merge commit '
d5d2d6c3b8cff61eb26c18bbd977881cf6d5524a '
* commit '
d5d2d6c3b8cff61eb26c18bbd977881cf6d5524a ':
dcadec: initialize variables before use
Conflicts:
libavcodec/dcadec.c
See:
53918a1c54b49e76c3ca517e2caada8372995712
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 13:00:55 +0000 (14:00 +0100)]
Merge commit '
1a9c1333b5d70b427c82cb98f383aa2fa9b2b319 '
* commit '
1a9c1333b5d70b427c82cb98f383aa2fa9b2b319 ':
escape124: explicitly set get_bits1 variable
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 12:59:22 +0000 (13:59 +0100)]
Merge commit '
2ffb0598dbdb81c40650952aa9299fa02fa5e834 '
* commit '
2ffb0598dbdb81c40650952aa9299fa02fa5e834 ':
mlpdec: check for negative index
Conflicts:
libavcodec/mlpdec.c
See:
8491ac3ad2e9fc92479d6fc42d6ee4cb8d6f61d3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 12:41:41 +0000 (13:41 +0100)]
Merge commit '
6abe7edabb7d57e82d7ea6312d30cf05d2192c5b '
* commit '
6abe7edabb7d57e82d7ea6312d30cf05d2192c5b ':
ffv1: fix out-of-bounds read
The change should be harmless but theres no out of array access before
the change
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 12:34:39 +0000 (13:34 +0100)]
Merge commit '
5aa710f46119bb9c1c38542f80f5338eb8b5ffb2 '
* commit '
5aa710f46119bb9c1c38542f80f5338eb8b5ffb2 ':
vorbisenc: add missing parenthesis
Conflicts:
libavcodec/vorbisenc.c
See:
f72b735d41f9591452d2efe0987040462b409c2d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 12:32:08 +0000 (13:32 +0100)]
Merge commit '
e9a6ae775dabef3942632e8d4ef95fff94a1b310 '
* commit '
e9a6ae775dabef3942632e8d4ef95fff94a1b310 ':
dpxenc: mention missing break
Conflicts:
libavcodec/dpxenc.c
No change as the changed code is implemented differently in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 12:30:59 +0000 (13:30 +0100)]
Merge commit '
4dda5e9b0829b119c17d950906c61d3ebffc494f '
* commit '
4dda5e9b0829b119c17d950906c61d3ebffc494f ':
sunrastenc: mention missing break
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 12:22:02 +0000 (13:22 +0100)]
Merge commit '
28d82b7675bea76a1349070a3cdd737d964d4775 '
* commit '
28d82b7675bea76a1349070a3cdd737d964d4775 ':
vc1dec: refactor check with missing parenthesis
Conflicts:
libavcodec/vc1_mc.c
tests/ref/fate/vc1_ilaced_twomv
Theres no change to the reference checksums as this bug was not
in FFmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 12:05:04 +0000 (13:05 +0100)]
Merge commit '
2c98dc75f2802a2fe91922d4a11b698b66420e5b '
* commit '
2c98dc75f2802a2fe91922d4a11b698b66420e5b ':
vc1dec: always initialize tx and ty
Not merged, tx/ty are initialized on every codepath before use
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 11:54:52 +0000 (12:54 +0100)]
Merge commit '
e3f50f247155216229e34f165bae8c329d5a001e '
* commit '
e3f50f247155216229e34f165bae8c329d5a001e ':
dnxhdenc: check negative index
Conflicts:
libavcodec/dnxhdenc.c
Not merged, the cid index thats taken out of our table will be found again in
said table.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 11:53:31 +0000 (12:53 +0100)]
Merge commit '
b1b1a7370e141c912e3d0bbaa668dcee05c3ad67 '
* commit '
b1b1a7370e141c912e3d0bbaa668dcee05c3ad67 ':
display: fix order of operands
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 11:13:38 +0000 (12:13 +0100)]
Merge commit '
bdcb5794f0c2d74371152303bffe4172671af264 '
* commit '
bdcb5794f0c2d74371152303bffe4172671af264 ':
nellymoserenc: fix array index
Not merged, the original code was correct.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 11:12:40 +0000 (12:12 +0100)]
Merge commit '
aa7c429c4e8e561009176d51b7dcb626c85eb276 '
* commit '
aa7c429c4e8e561009176d51b7dcb626c85eb276 ':
nellymoserenc: fix array element ordering
See:
62722ae2d4b2e5f632c725e150dde0f7d0fbfe8d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 11:12:16 +0000 (12:12 +0100)]
Merge commit '
8dd0a2c5cf40a8a49faae985adc11750b6429132 '
* commit '
8dd0a2c5cf40a8a49faae985adc11750b6429132 ':
libopusenc: prevent an out-of-bounds read by returning early
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 11:01:37 +0000 (12:01 +0100)]
Merge commit '
b09cf8afc5199d359ac985ad7cea72a6a9f20e4e '
* commit '
b09cf8afc5199d359ac985ad7cea72a6a9f20e4e ':
libopusenc: check return value
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 10:59:44 +0000 (11:59 +0100)]
Merge commit '
29234f56818135faf2f1868ab324c073abd28fbd '
* commit '
29234f56818135faf2f1868ab324c073abd28fbd ':
vp7: fix checking vp7_feature_value_size()
See:
28f8114bd240712e5c2a9b52df519858fccc267c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 10:34:04 +0000 (11:34 +0100)]
Merge commit '
68a35473ed423a14731c418939fba7913647979a '
* commit '
68a35473ed423a14731c418939fba7913647979a ':
4xm: more thorought check for negative index and negative shift
Conflicts:
libavcodec/4xm.c
Mostly not merged, the added checks, check for impossible conditions
for paranoias sake they are replaced by asserts but thats probably overkill
the vlc table does not contain out of range values or holes,
nor does it permit the log2 values to become negative. Whenever a
log2 value reaches 0 the selected table no longer contains an entry to trigger
the case that would decrease it further
Adding such impossible checks would confuse the reader
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Thu, 13 Nov 2014 01:48:40 +0000 (02:48 +0100)]
avcodec/utils: Add ATRAC3+ to av_get_audio_frame_duration()
Fixes Ticket3979
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Vittorio Giovara [Wed, 12 Nov 2014 10:13:11 +0000 (11:13 +0100)]
jpeg2000: do not compute the same value twice
CC: libav-stable@libav.org
Bug-Id: CID
1026771 / CID
1026772 / CID
1026773
Vittorio Giovara [Wed, 12 Nov 2014 10:13:07 +0000 (11:13 +0100)]
svq1enc: check ff_get_buffer return value
CC: libav-stable@libav.org
Bug-Id: CID 747723
Vittorio Giovara [Wed, 12 Nov 2014 10:13:06 +0000 (11:13 +0100)]
ansi: check ff_set_dimensions return value
CC: libav-stable@libav.org
Bug-Id: CID
1135737
Vittorio Giovara [Wed, 12 Nov 2014 10:13:05 +0000 (11:13 +0100)]
avs: check ff_set_dimensions return value
CC: libav-stable@libav.org
Bug-Id: CID
1135738
Vittorio Giovara [Wed, 12 Nov 2014 10:13:04 +0000 (11:13 +0100)]
g2meet: check ff_set_dimensions return value
CC: libav-stable@libav.org
Bug-Id: CID
1135739
Vittorio Giovara [Wed, 12 Nov 2014 10:13:02 +0000 (11:13 +0100)]
indeo3: check ff_set_dimensions return value
CC: libav-stable@libav.org
Bug-Id: CID
1135740
Vittorio Giovara [Tue, 11 Nov 2014 16:40:08 +0000 (17:40 +0100)]
shorten: check for return value
Avoid a possible negative bitshift.
CC: libav-stable@libav.org
Bug-Id: CID
1194400
Vittorio Giovara [Wed, 12 Nov 2014 10:13:03 +0000 (11:13 +0100)]
dcadec: initialize variables before use
CC: libav-stable@libav.org
Bug-Id: CID 700751 / CID 700752
Vittorio Giovara [Tue, 11 Nov 2014 16:40:09 +0000 (17:40 +0100)]
escape124: explicitly set get_bits1 variable
Makes coverity less confused.
CC: libav-stable@libav.org
Bug-Id: CID
1203487
Vittorio Giovara [Tue, 11 Nov 2014 16:40:06 +0000 (17:40 +0100)]
mlpdec: check for negative index
CC: libav-stable@libav.org
Bug-Id: CID 970924
Vittorio Giovara [Tue, 11 Nov 2014 16:40:04 +0000 (17:40 +0100)]
ffv1: fix out-of-bounds read
CC: libav-stable@libav.org
Bug-Id: CID
1047234
Vittorio Giovara [Tue, 11 Nov 2014 16:40:03 +0000 (17:40 +0100)]
vorbisenc: add missing parenthesis
Bug-Id: CID
1238791
Vittorio Giovara [Tue, 11 Nov 2014 16:40:02 +0000 (17:40 +0100)]
dpxenc: mention missing break
Bug-Id: CID 732229
Vittorio Giovara [Tue, 11 Nov 2014 16:40:01 +0000 (17:40 +0100)]
sunrastenc: mention missing break
Bug-Id: CID 732231
Vittorio Giovara [Tue, 11 Nov 2014 16:40:00 +0000 (17:40 +0100)]
vc1dec: refactor check with missing parenthesis
FATE tests updated accordingly, no visual difference.
CC: libav-stable@libav.org
Bug-Id: CID
1087087
Vittorio Giovara [Tue, 11 Nov 2014 16:39:59 +0000 (17:39 +0100)]
vc1dec: always initialize tx and ty
CC: libav-stable@libav.org
Bug-Id: CID
1245702 / CID
1245703
Vittorio Giovara [Tue, 11 Nov 2014 12:27:03 +0000 (13:27 +0100)]
dnxhdenc: check negative index
CC: libav-stable@libav.org
Bug-Id: CID 700464
Vittorio Giovara [Tue, 11 Nov 2014 12:27:02 +0000 (13:27 +0100)]
display: fix order of operands
CC: libav-stable@libav.org
Bug-Id: CID
1238828 / CID
1238832
Vittorio Giovara [Tue, 11 Nov 2014 12:26:57 +0000 (13:26 +0100)]
nellymoserenc: fix array index
CC: libav-stable@libav.org
Bug-Id: CID 732258
Michael Niedermayer [Tue, 11 Nov 2014 12:26:56 +0000 (13:26 +0100)]
nellymoserenc: fix array element ordering
Fixes assertion failures and valgrind warnings in trellis encoder.
CC: libav-stable@libav.org
Bug-Id: CID 732256 / CID 732257
Vittorio Giovara [Tue, 11 Nov 2014 12:26:55 +0000 (13:26 +0100)]
libopusenc: prevent an out-of-bounds read by returning early
CC: libav-stable@libav.org
Bug-Id: CID
1244188
Vittorio Giovara [Tue, 11 Nov 2014 12:26:54 +0000 (13:26 +0100)]
libopusenc: check return value
CC: libav-stable@libav.org
Bug-Id: CID 739870
Michael Niedermayer [Tue, 11 Nov 2014 12:27:00 +0000 (13:27 +0100)]
vp7: fix checking vp7_feature_value_size()
CC: libav-stable@libav.org
Bug-Id: CID
1197061
Vittorio Giovara [Sun, 9 Nov 2014 07:48:41 +0000 (08:48 +0100)]
4xm: more thorought check for negative index and negative shift
CC: libav-stable@libav.org
Bug-Id: CID
1087094
Michael Niedermayer [Wed, 12 Nov 2014 22:53:08 +0000 (23:53 +0100)]
swscale/utils: support bayer input + scaling, and bayer input + any supported output
Fixes Ticket4053
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Tue, 11 Nov 2014 20:17:58 +0000 (21:17 +0100)]
lavu/opt: fix av_opt_get function
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sat, 8 Nov 2014 18:17:48 +0000 (19:17 +0100)]
ffserver_config: report not closed last tag
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Wed, 12 Nov 2014 22:26:45 +0000 (23:26 +0100)]
lavu/opt: fix memleak in test
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Michael Niedermayer [Wed, 12 Nov 2014 17:14:28 +0000 (18:14 +0100)]
avcodec/dvbsubdec: av_assert* instead of assert()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
James Almer [Mon, 10 Nov 2014 20:06:08 +0000 (17:06 -0300)]
x86/flacdsp: separate decoder and encoder dsp initialization
Signed-off-by: James Almer <jamrial@gmail.com>
Michael Niedermayer [Wed, 12 Nov 2014 16:28:53 +0000 (17:28 +0100)]
avcodec/dvbsubdec: Cleanup on *malloc failure
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Rong Yan [Wed, 12 Nov 2014 07:02:46 +0000 (07:02 +0000)]
libswscale/ppc/swscale_altivec.c : fix hScale_altivec_real() yuv2planeX_16_altivec() yuv2planeX_8() for little endian
add marcos GET_LS() GET_VF() LOAD_FILTER() LOAD_L1() GET_VF4() FIRST_LOAD() UPDATE_PTR() LOAD_SRCV() LOAD_SRCV8() GET_VFD() for POWER LE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Carl Eugen Hoyos [Wed, 12 Nov 2014 12:52:56 +0000 (13:52 +0100)]
lavf/tcp: Clarify that the -timeout option takes microseconds.
Carl Eugen Hoyos [Wed, 12 Nov 2014 08:55:11 +0000 (09:55 +0100)]
lavd/avfoundation: Remove unused -frame_rate option.
Reimar Döffinger [Wed, 12 Nov 2014 08:53:01 +0000 (09:53 +0100)]
configure: Hack to treat x32 as x86_64.
Allows shared compilation on x32 with --disable-asm.
Michael Niedermayer [Wed, 12 Nov 2014 02:27:26 +0000 (03:27 +0100)]
avcodec/h264_parser: Avoid adding SEI to the global header
Only consider SEI when no PPS has been found yet
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Wed, 12 Nov 2014 00:04:46 +0000 (01:04 +0100)]
Merge remote-tracking branch 'cus/stable'
* cus/stable:
ffplay: signal the frame queue before closing audio
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Vignesh Venkatasubramanian [Tue, 11 Nov 2014 18:02:05 +0000 (10:02 -0800)]
lavf/webmdashenc: Representation IDs should be unique.
According to the DASH spec, Representation IDs should be unique
across all adaptation sets. Fixing that and updating the fate
reference file to reflect this change.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 23:08:06 +0000 (00:08 +0100)]
Merge commit '
c9c7d59b7d26f0328d612995dd9256337ae1cbfb '
* commit '
c9c7d59b7d26f0328d612995dd9256337ae1cbfb ':
tiff: Use av_mallocz_array
Conflicts:
libavcodec/tiffenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 22:54:37 +0000 (23:54 +0100)]
Merge commit '
c6074a30ba3b5fb4319ee6ee599656d58548cdc8 '
* commit '
c6074a30ba3b5fb4319ee6ee599656d58548cdc8 ':
opt: Fix the documentation mentioning av_set_string3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 22:19:27 +0000 (23:19 +0100)]
Merge commit '
1b667269062eb6aec0b8726393ea91b7f7f57fde '
* commit '
1b667269062eb6aec0b8726393ea91b7f7f57fde ':
h264_parser: don't stop on SPS_EXT in split
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 22:18:03 +0000 (23:18 +0100)]
Merge commit '
4cb9f1a77432de6f368df69bebbc082368a88c86 '
* commit '
4cb9f1a77432de6f368df69bebbc082368a88c86 ':
h264_cabac: fix one fill_rectangle() indentation level
See:
4260ed462b4ca92e90fb13006b7b5db8010a32d0
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 22:16:15 +0000 (23:16 +0100)]
Merge commit '
60b055133485891405722bc9722e2c74fc9764b8 '
* commit '
60b055133485891405722bc9722e2c74fc9764b8 ':
png_parser: fix size of chunk_lenght
Conflicts:
libavcodec/png_parser.c
See:
2ee6dca3b8f40132be5c8b77e3700a9e3f26c382
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 22:06:44 +0000 (23:06 +0100)]
Merge commit '
443502aed8b814d883825e52e91e4f018955aa66 '
* commit '
443502aed8b814d883825e52e91e4f018955aa66 ':
dvbsubdec: move shared codepath
Conflicts:
libavcodec/dvbsubdec.c
The merged code is ignored and the factorization redone with
the code that is in FFmpeg.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Marton Balint [Mon, 10 Nov 2014 22:23:47 +0000 (23:23 +0100)]
ffplay: signal the frame queue before closing audio
Fixed regression caused by
631ac655c00e978e19d05dab572bc1ffd6078c63 when ffplay
does not quit if the audio thread is blocked.
Signed-off-by: Marton Balint <cus@passwd.hu>
Michael Niedermayer [Thu, 31 Jul 2014 11:25:43 +0000 (13:25 +0200)]
avcodec/dvbsubdec: Fix 8bit non_mod case
Untested, i failed to find a sample which triggers this case
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 21:20:20 +0000 (22:20 +0100)]
avcodec/dvbsubdec: use av_freep() for saftey
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 21:19:54 +0000 (22:19 +0100)]
Merge commit '
2383323661f3b8342b2c4d356fcfe8c5d1b045f8 '
* commit '
2383323661f3b8342b2c4d356fcfe8c5d1b045f8 ':
dvbsubdec: improve error checking
Conflicts:
libavcodec/dvbsubdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 21:15:14 +0000 (22:15 +0100)]
avcodec/dvbsubdec: Add return code to save_subtitle_set()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Michael Niedermayer [Tue, 11 Nov 2014 21:04:34 +0000 (22:04 +0100)]
Michael Niedermayer [Tue, 11 Nov 2014 21:03:27 +0000 (22:03 +0100)]
Michael Niedermayer [Tue, 11 Nov 2014 20:46:56 +0000 (21:46 +0100)]
Merge commit '
9e9be5a20c0b36dce1cae11f5f5957886231a764 '
* commit '
9e9be5a20c0b36dce1cae11f5f5957886231a764 ':
hevc_mvs: prevent unitialized use
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Lukasz Marek [Sun, 9 Nov 2014 22:10:34 +0000 (23:10 +0100)]
fate: add opt-test
Lukasz Marek [Sun, 9 Nov 2014 22:09:44 +0000 (23:09 +0100)]
lavu/opt: update tests
In general this commit prepares opt tests to be added to fate.
The commit set some non-zero defaults for test options.
It allows to check if defaults are really set.
Added printing of default values.
Added more cases for testing av_set_options_string
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sun, 9 Nov 2014 22:09:07 +0000 (23:09 +0100)]
lavu/opt: add support for binary defaults
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Lukasz Marek [Sun, 9 Nov 2014 22:15:58 +0000 (23:15 +0100)]
lavu/opt: check for NULL before parsing
set_string_binary crashes when called with val==NULL
Signed-off-by: Lukasz Marek <lukasz.m.luki2@gmail.com>
Michael Niedermayer [Tue, 11 Nov 2014 20:38:55 +0000 (21:38 +0100)]
Merge commit '
0e1ebfebc8326069732795698a82f3fea0742a54 '
* commit '
0e1ebfebc8326069732795698a82f3fea0742a54 ':
4xm: drop unnecessary check
Conflicts:
libavcodec/4xm.c
The check is currently redundant, it is for saftey left in place though
Merged-by: Michael Niedermayer <michaelni@gmx.at>