generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
58,302 Commits 24 Branches 241 Tags 173 MiB
9343fc30e2
Commit Graph

26281 Commits

Author SHA1 Message Date
Marton Balint
a494757b34 libzvbi-teletextdec: support multiple teletext pages in a single packet 
After this patch, if a packet contains multiple teletext pages, the teletext
decoder can return the fist page and store the remaining pages in memory, and
return them to the user on the next calls to avcodec_decode_subtitle2.

Signed-off-by: Marton Balint <cus@passwd.hu>
 2013-11-10 18:57:51 +01:00
Michael Niedermayer
78e150c5e9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  hwaccel: Simplify ff_find_hwaccel

Conflicts:
	libavcodec/mpeg12dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 17:37:51 +01:00
Diego Biurrun
45ef963908 mpegaudioenc: Move some static tables to MpegAudioContext 
This reduces global state and the amount of globally visible tables.
 2013-11-10 16:07:22 +01:00
Diego Biurrun
5d6a990c11 mpegaudioenc: Remove broken integer-only quantization code path 2013-11-10 16:07:22 +01:00
Luca Barbato
08303d7741 hwaccel: Simplify ff_find_hwaccel 
It is always called by passing fields from an AVCodecContext.
 2013-11-10 13:59:48 +01:00
Michael Niedermayer
1836a42c29 avcodec/vp8: remove unused webp_decode_frame() 
See: libavcodec/webp.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-10 12:27:21 +01:00
Ronald S. Bultje
dd3d0f46bd vp9: fix mvref finding to adhere to bug in libvpx. 
Fixes a particular youtube video that I unfortunately can't share.
 2013-11-09 21:31:06 +01:00
Michael Niedermayer
ac4447b6ec Merge commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45' 
* commit '5462dde1947e0ecfcb2db99ae29ce9dee8933b45':
  metasound: Fix error message argument

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 23:37:14 +01:00
Paul B Mahol
b8f276e645 avcodec/mimic: use av_freep() and reset swap_buf_size 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-08 19:24:17 +00:00
Paul B Mahol
2145e8f193 avcodec/vmdav: use av_freep() and reset unpack_buffer_size 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-08 19:24:17 +00:00
Michael Niedermayer
e93523a06f Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h263dsp: K&R formatting cosmetics

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 18:02:50 +01:00
Michael Niedermayer
a30f7918b5 Merge commit '0338c396987c82b41d322630ea9712fe5f9561d6' 
* commit '0338c396987c82b41d322630ea9712fe5f9561d6':
  dsputil: Split off H.263 bits into their own H263DSPContext

Conflicts:
	configure
	libavcodec/mpegvideo.h
	libavcodec/mpegvideo_enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 17:42:56 +01:00
Kostya Shishkov
5462dde194 metasound: Fix error message argument 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-08 16:50:17 +01:00
Diego Biurrun
cb56c3961b h263dsp: K&R formatting cosmetics 
Also remove array element numbering comments.
 2013-11-08 12:41:24 +01:00
Diego Biurrun
0338c39698 dsputil: Split off H.263 bits into their own H263DSPContext 2013-11-08 12:40:47 +01:00
Michael Niedermayer
b7fea3daab libavcodec/dvdsubdec: remove exit() call in debug code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-08 00:42:50 +01:00
Michael Niedermayer
48f37664a8 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  Remove #undefs for formerly forbidden system functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-07 23:39:31 +01:00
Paul B Mahol
9521236881 avcodec/libfdk-aacdec: remove redundant log messages 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-07 14:55:35 +00:00
Paul B Mahol
315e3cf047 avcodec/hnm4video: remove redundant log message 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-07 14:04:21 +00:00
Diego Biurrun
86f910806b Remove #undefs for formerly forbidden system functions 
The macros forbidding the system functions no longer exist, obviating
the need for the #undefs.
 2013-11-07 00:26:15 +01:00
Clément Bœsch
87434cf373 avcodec/vp9: add ff_vp9_idct_idct_{4x4,8x8}_ssse3(). 
1789 decicycles in idct_idct_4x4_add_c, 262136 runs, 8 skips
1839 decicycles in idct_idct_4x4_add_c, 524270 runs, 18 skips
1864 decicycles in idct_idct_4x4_add_c, 1048548 runs, 28 skips

529 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 262138 runs, 6 skips
516 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 524282 runs, 6 skips
474 decicycles in ff_vp9_idct_idct_4x4_add_ssse3, 1048565 runs, 11 skips

(~3.9x faster)

7726 decicycles in idct_idct_8x8_add_c, 1048433 runs, 143 skips
7732 decicycles in idct_idct_8x8_add_c, 2096882 runs, 270 skips
7731 decicycles in idct_idct_8x8_add_c, 4193772 runs, 532 skips

1145 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 1048549 runs, 27 skips
1137 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 2097097 runs, 55 skips
1086 decicycles in ff_vp9_idct_idct_8x8_add_ssse3, 4194188 runs, 116 skips

(~7.1x faster)

Overall decode time before commit:
  16.48s user 0.03s system 99% cpu 16.526 total
  16.54s user 0.01s system 99% cpu 16.566 total
  16.46s user 0.03s system 99% cpu 16.511 total

Overall decode time after commit:
  16.34s user 0.02s system 99% cpu 16.378 total
  16.28s user 0.02s system 99% cpu 16.315 total
  16.32s user 0.03s system 99% cpu 16.366 total

Tested on i7 920 with 40s 1080p footage.
 2013-11-05 19:25:40 +01:00
Paul B Mahol
e3f384b428 avcodec/mss2: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 13:19:30 +00:00
Paul B Mahol
82f5c4d737 avcodec/flashsv: use av_freep() for tmpblock 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 13:19:30 +00:00
Paul B Mahol
b79f543c58 avcodec/mss1: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 13:19:30 +00:00
Paul B Mahol
c3311515d5 avcodec/flashsv: fix typo 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:44:52 +00:00
Paul B Mahol
ad1dfe04a1 avcodec/tscc2: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:44:20 +00:00
Paul B Mahol
290be34a74 avcodec/brender_pix: stop calling av_image_check_size() twice 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:37:52 +00:00
Paul B Mahol
6e094f7026 avcodec/flashsv: stop using deprecated avcodec_set_dimensions 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:36:24 +00:00
Paul B Mahol
22c00962c2 avcodec/flashsv: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:31:18 +00:00
Paul B Mahol
1a244c22ea avcodec/brender_pix: stop using deprecated avcodec_set_dimensions 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:26:58 +00:00
Paul B Mahol
7722ae35eb avcodec/c93: stop using deprecated avcodec_set_dimensions 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-05 12:24:39 +00:00
Michael Niedermayer
e1459f4b0b Merge commit '70cbf33405f50dfaf77e85f382a188acf17dc71a' 
* commit '70cbf33405f50dfaf77e85f382a188acf17dc71a':
  vdpau: Add missing #includes to fix standalone header compilation

Conflicts:
	libavcodec/vdpau_internal.h

Not completely merged as this would break use of vdpau.h from C++

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 11:14:29 +01:00
Michael Niedermayer
934e489ee8 Merge commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930' 
* commit 'e2b5b097898c9155f4bdff4d83cdc54d5eef6930':
  x86: rv40dsp: Use PAVGB instruction macro where appropriate

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-05 10:26:07 +01:00
Diego Biurrun
70cbf33405 vdpau: Add missing #includes to fix standalone header compilation 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-04 22:54:55 +01:00
Michael Niedermayer
2865c1b905 Merge commit '3ef9b7ab95cc703b67a8b658dca45c80df0aaa66' 
* commit '3ef9b7ab95cc703b67a8b658dca45c80df0aaa66':
  hevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 21:43:27 +01:00
Michael Niedermayer
b906d04881 Merge commit '885ec9242554ad25922258a595ec5e317922a412' 
* commit '885ec9242554ad25922258a595ec5e317922a412':
  hevc: Use parsed VUI colorimetry in avcodec

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 21:37:34 +01:00
Michael Niedermayer
be41f21a3d Merge commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212' 
* commit 'cd8f772d0678a90957f4dfd5ce51af9d22e3f212':
  lavc: Add colorimetry values for BT.2020, other non-included ones

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 21:26:34 +01:00
Diego Biurrun
e2b5b09789 x86: rv40dsp: Use PAVGB instruction macro where appropriate 2013-11-04 21:14:39 +01:00
Yusuke Nakamura
3ef9b7ab95 hevc_ps: Use AV_PIX_FMT_YUVJ420P if YUV 4:2:0 8-bit full scale 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2013-11-04 16:19:53 +01:00
Jan Ekström
885ec92425 hevc: Use parsed VUI colorimetry in avcodec 
Also limit the parsed VUI values to known valid ones.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2013-11-04 16:03:11 +01:00
Jan Ekström
cd8f772d06 lavc: Add colorimetry values for BT.2020, other non-included ones 
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2013-11-04 15:39:33 +01:00
Michael Niedermayer
405ceb1812 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  aacdec: Set the profile during decoding

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 11:51:13 +01:00
Michael Niedermayer
ab71be0912 Merge commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9' 
* commit 'da6506c607eda585ba4b15430cf3c9a2ce09c3a9':
  lavc: move AVCodecContext.pkt to AVCodecInternal

Conflicts:
	libavcodec/internal.h
	libavcodec/rawdec.c
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 11:41:55 +01:00
Michael Niedermayer
3fc26d8073 Merge commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12' 
* commit '38ecc3702dabbea09230f6d6333f59e74f5d1c12':
  pthread: store thread contexts in AVCodecInternal instead of AVCodecContext

Conflicts:
	libavcodec/internal.h
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 11:14:38 +01:00
Michael Niedermayer
2a7cbc29a8 Merge commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18' 
* commit 'daa7a1d4431b6acf1f93c4a98b3de123abf4ca18':
  pthread_slice: rename ThreadContext -> SliceThreadContext

Conflicts:
	libavcodec/pthread_slice.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 11:05:52 +01:00
Michael Niedermayer
4eea41cba1 Merge commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb' 
* commit 'cc14ee03a7b91c69343f8d60c9e089a1950eeadb':
  lavc: split slice and frame threading functions into separate files

Conflicts:
	libavcodec/Makefile
	libavcodec/pthread.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 10:44:34 +01:00
Michael Niedermayer
3d4dc43259 Merge commit '5cd6513f5be14b9744783d3d9e853d3f11065e93' 
* commit '5cd6513f5be14b9744783d3d9e853d3f11065e93':
  pthread: drop avcodec_ prefixes from static functions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 09:55:24 +01:00
Gian-Carlo Pascutto
454959a5aa aacdec: Set the profile during decoding 
Previously the profile would not be set if the bitstream needs
to be decoded to know the profile.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-11-04 08:51:26 +01:00
Anton Khirnov
da6506c607 lavc: move AVCodecContext.pkt to AVCodecInternal 
It's a private field, not meant to be accessed from outside lavc.
 2013-11-04 08:51:26 +01:00
Anton Khirnov
38ecc3702d pthread: store thread contexts in AVCodecInternal instead of AVCodecContext 
It's a private field, it should not be visible to callers.

Deprecate AVCodecContext.thread_opaque
 2013-11-04 08:51:26 +01:00
Anton Khirnov
daa7a1d443 pthread_slice: rename ThreadContext -> SliceThreadContext 
This should prevent confusion with frame threading.
 2013-11-04 08:51:26 +01:00
Anton Khirnov
cc14ee03a7 lavc: split slice and frame threading functions into separate files 2013-11-04 08:51:26 +01:00
Anton Khirnov
5cd6513f5b pthread: drop avcodec_ prefixes from static functions 2013-11-04 08:51:26 +01:00
Ronald S. Bultje
6cf0c4107f Put vp9_scans and vp9_scans_nb in ro_data. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-04 02:32:18 +01:00
Mikulas Patocka
694d997afe x86: hpeldsp: Use PAVGB instruction macro where necessary 
Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-04 01:29:23 +01:00
Michael Niedermayer
336a1902d6 avcodec/ffv1enc: Check high bpp RGB against coder type too 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 22:18:47 +01:00
Mikulas Patocka
074155360d avcodec/x86/hpeldsp: fix crash on AMD K6-3+ 
There are instructions pavgb and pavgusb. Both instructions do the same
operation but they have different enconding. Pavgb exists in SSE (or
MMXEXT) instruction set and pavgusb exists in 3D-NOW instruction set.

livavcodec uses the macro PAVGB to select the proper instruction. However,
the function avg_pixels8_xy2 doesn't use this macro, it uses pavgb
directly.

As a consequence, the function avg_pixels8_xy2 crashes on AMD K6-2 and
K6-3 processors, because they have pavgusb, but not pavgb.

This bug seems to be introduced by commit
71155d7b41, "dsputil: x86: Convert mpeg4
qpel and dsputil avg to yasm"

Signed-off-by: Mikulas Patocka <mikulas@artax.karlin.mff.cuni.cz>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 19:49:11 +01:00
Stefano Sabatini
cfe7185a92 lavc: remove dead FF_API_OLD_TIMECODE API 2013-11-03 17:58:44 +01:00
Stefano Sabatini
a689560428 lavc: remove dead FF_API_AVCODEC_OPEN API 2013-11-03 17:58:44 +01:00
Stefano Sabatini
d3397c3e82 lavc: remove dead FF_API_ALLOC_CONTEXT API 2013-11-03 17:58:44 +01:00
Stefano Sabatini
90c329cc25 lavc/version.h: remove empty line 2013-11-03 13:13:24 +01:00
Stefano Sabatini
5a6e6dcaa4 lavc: drop deprecated audio_convert API at the next major bump 
Also make AVCODEC_RESAMPLE API removal depends on its presence, since its
code depends on it as well.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2013-11-03 13:13:24 +01:00
Michael Niedermayer
cf49d5907a avcodec/ansi: set w/h correctly at the top 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 13:00:10 +01:00
Michael Niedermayer
b568eeba75 Merge commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179' 
* commit '3ea5f64ffff0a51f62922efd2e2bc231b13b2179':
  ansi: fix possible use of uninitialized variables

Conflicts:
	libavcodec/ansi.c

Only partially merged, ffmpeg is not affected by this.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 12:58:54 +01:00
Vittorio Giovara
3ea5f64fff ansi: fix possible use of uninitialized variables 2013-11-03 11:51:40 +01:00
Michael Niedermayer
8a701ef7dd avcodec/hevc_sei: Fix null dereference in decode_pic_timing() 
Fixes Ticket3106

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 02:19:28 +01:00
Michael Niedermayer
63a37d0e1e avcodec/hevc_sei: check active_seq_parameter_set_id validity 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 02:13:55 +01:00
Michael Niedermayer
6e87dfb589 mpegvideo: reduce whitespace differences to libav 
This excludes many changes that worsen readability

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 01:24:01 +01:00
Michael Niedermayer
4fb1221e66 h264: reduce whitespace differences to libav 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 01:16:31 +01:00
James Zern
23c03ac91e libvpxenc: allow qmax of 0 
this is valid for both vp8 & vp9 and necessary for lossless in the
latter

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 01:00:16 +01:00
James Zern
517afd72c6 libvpxenc: add VP9 options 
same as their vpxenc equivalents:
-lossless
-tile-columns
-tile-rows
-frame-parallel

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-03 00:35:15 +01:00
Michael Niedermayer
1fb3b494fa ffv1enc: store 2pass statistics at the end 
This reduces their size from O(n) to O(1)

Fixes Ticket3078

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 22:52:52 +01:00
Michael Niedermayer
8d88ed9a1f avcodec/ffv1enc: pass through pts 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 22:52:52 +01:00
James Zern
a8bcc956fd libvpxenc: split vp8/vp9 options array 
the current options are left for both to provide command line compatibility

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 20:35:12 +01:00
Timothy Gu
d3211cfaed avcodec/libmp3lame: add ABR support 
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 18:44:20 +01:00
Michael Niedermayer
1654e64bba Merge commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58' 
* commit 'c68d4c230ad8ca85af3999a6af8e582c43620d58':
  mpeg4video_parser: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4video_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 18:31:41 +01:00
Michael Niedermayer
a805e2e653 avcodec/hevc: add "apply_defdispwin" alias for compatibilty with 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 18:24:24 +01:00
Michael Niedermayer
35594c48ca libavcodec/hevc: random cosmetics to reduce diff to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 17:28:44 +01:00
Michael Niedermayer
2c4f573696 libavcodec/hevc: random cosmetics to reduce diff to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 15:32:15 +01:00
Michael Niedermayer
e877455ff9 libavcodec/hevcdsp_template: whitespaces to reduce diff to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 15:11:41 +01:00
Michael Niedermayer
42dbe2d9b1 libavcodec/hevcdsp_template: random cosmetics to reduce diff to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 14:42:57 +01:00
Michael Niedermayer
69b3668b83 libavcodec/hevc: indention related cosmetics to reduce diff to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 14:36:59 +01:00
Michael Niedermayer
6a84d17bd7 libavcodec/hevcdsp_template: cosmetics to reduce diff to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 14:30:22 +01:00
Michael Niedermayer
b23692b3a8 libavcodec/hevc: reduce whitespace differences to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 14:10:21 +01:00
Michael Niedermayer
1a6948fa70 libavcodec/hevc: reduce bracket differences to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 13:09:31 +01:00
Michael Niedermayer
ce7f1c76bd avcodec/hevc: more whitespaces to reduce difference to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 12:33:54 +01:00
Vittorio Giovara
c68d4c230a mpeg4video_parser: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-02 12:08:49 +01:00
Michael Niedermayer
1344c04536 Merge commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0' 
* commit 'dc6ea00cd2b91b591e6726e5bf1d5e03a4a9bdd0':
  mpeg4video: K&R formatting cosmetics

Conflicts:
	libavcodec/mpeg4video.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 10:30:30 +01:00
Michael Niedermayer
0b82fdcc46 Merge commit '037fea388e0df2a22441bc1ed86794152161baf1' 
* commit '037fea388e0df2a22441bc1ed86794152161baf1':
  flashsv: K&R formatting cosmetics

Conflicts:
	libavcodec/flashsv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 10:19:12 +01:00
Michael Niedermayer
7146eacfc5 Merge commit '1700b4e678ed329611a16b20d11e64b7abda4839' 
* commit '1700b4e678ed329611a16b20d11e64b7abda4839':
  x86: vp8dsp: Split loopfilter code into a separate file

Conflicts:
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 10:13:14 +01:00
Michael Niedermayer
525289ed26 Merge commit '57070b1468edc6ac8cb3696c817f3c943975d4c1' 
* commit '57070b1468edc6ac8cb3696c817f3c943975d4c1':
  flashsv: Check diff_start diff_height values

Conflicts:
	libavcodec/flashsv.c

See: 880c73cd76
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 09:39:51 +01:00
Michael Niedermayer
77c33424c1 Merge commit '4a64e67988dd01005efb1ae831bff14c1656b573' 
* commit '4a64e67988dd01005efb1ae831bff14c1656b573':
  flashsv: Refactor a little

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 09:33:34 +01:00
Michael Niedermayer
8183e33225 h264_refs: use named constant for setting frame_recovered 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 09:31:12 +01:00
Michael Niedermayer
647adc4290 h264: factor "if(h->sei_recovery_frame_cnt >= 0)" out 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 01:02:21 +01:00
Michael Niedermayer
f578e5d937 avcodec/hevc: Adjust white-spaces to reduce difference to 064698d381 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 00:44:54 +01:00
Mickaël Raulet
38612379bf hevc: fix temporal_id(cherry picked from commit 5eac0df49d33bef7f3ffc5efde19839dddb554e8) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-02 00:44:54 +01:00
Vittorio Giovara
dc6ea00cd2 mpeg4video: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-01 22:53:48 +01:00
Luca Barbato
037fea388e flashsv: K&R formatting cosmetics 
Also improve some log message wording/spelling.

Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-11-01 22:32:53 +01:00
Diego Biurrun
1700b4e678 x86: vp8dsp: Split loopfilter code into a separate file 2013-11-01 22:05:20 +01:00
Paul B Mahol
0610d6e8ae avcodec/mvcdec: stop using deprecated avcodec_set_dimensions() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-01 19:05:35 +00:00
Paul B Mahol
256b986c04 avcodec/exr: stop using deprecated avcodec_set_dimensions() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-01 19:05:35 +00:00
Paul B Mahol
01507ab369 avcodec/sanm: stop using deprecated avcodec_set_dimensions() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-11-01 19:05:35 +00:00
Michael Niedermayer
73d887733d avcodec/tiff_common: allow count = 0 in ff_tadd_bytes_metadata() 
Fixes Ticket3103

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 19:49:05 +01:00
Michael Niedermayer
57070b1468 flashsv: Check diff_start diff_height values 
Fix out of array accesses.

Found-by: ami_stuff
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 19:38:53 +01:00
Luca Barbato
4a64e67988 flashsv: Refactor a little 2013-11-01 19:38:53 +01:00
Michael Niedermayer
382545ae62 Merge commit '28240a60c1b5ce276e947ba013271ec009adc078' 
* commit '28240a60c1b5ce276e947ba013271ec009adc078':
  lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 19:20:02 +01:00
Michael Niedermayer
935d0ee08d Merge commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3' 
* commit 'eb5920c195d1b0bda81782af4ba0c5982f5225b3':
  lavc: deprecate unused FF_BUG_OLD_MSMPEG4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 19:12:13 +01:00
Michael Niedermayer
7592d30bcb Merge commit '0300962b76644f145b773439989a5cdf1667e162' 
* commit '0300962b76644f145b773439989a5cdf1667e162':
  lavc: schedule FF_BUG_AC_VLC for removal on the next major bump.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 19:03:19 +01:00
Michael Niedermayer
9bcf647867 avcodec: document that FF_DEBUG_VIS_QP / FF_DEBUG_VIS_MB_TYPE should only be used through avoptions 
This preempts ABI issues if their values get reused by the fork for something unrelated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 18:53:01 +01:00
Michael Niedermayer
2a2cc0af6d Merge commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8' 
* commit 'f8b2bcd2adab65658ffd45f9f13b032af6600bf8':
  lavc: deprecate FF_DEBUG_VIS_*

leave the AVOptions as they work fine

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 18:51:34 +01:00
Michael Niedermayer
f49e6359b6 avcodec/avcodec.h: move debug_mv to the end of the struct with the next ABI bump 
This maintains ABI compatibility
also add a note that debug_mv must be accessed through AVOptions (for ABI)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 18:38:51 +01:00
Michael Niedermayer
66df6f5407 Merge commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577' 
* commit 'a1504eee41b39f62dbfe0a0ca6b96c2716bf7577':
  lavc: deprecate AVCodecContext.debug_mv

Conflicts:
	libavcodec/options_table.h

Not merged, debug_mv works fine

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 18:36:46 +01:00
Michael Niedermayer
c6c03dfdf1 Merge commit 'ccc71298456d97f64f539e303c771d04dcb33c53' 
* commit 'ccc71298456d97f64f539e303c771d04dcb33c53':
  lavc: deprecate FF_DEBUG_MV and remove all traces of its use

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 18:22:42 +01:00
Michael Niedermayer
5eb1704d5f Merge commit '064698d381e1e7790f21b0199a8930ea04e2e942' 
* commit '064698d381e1e7790f21b0199a8930ea04e2e942':
  Add HEVC decoder

Conflicts:
	Changelog
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/hevc.c
	libavcodec/hevc.h
	libavcodec/hevc_cabac.c
	libavcodec/hevc_filter.c
	libavcodec/hevc_mvs.c
	libavcodec/hevc_parser.c
	libavcodec/hevc_ps.c
	libavcodec/hevc_refs.c
	libavcodec/hevc_sei.c
	libavcodec/hevcdsp.c
	libavcodec/hevcdsp_template.c
	libavcodec/hevcpred.c
	libavcodec/hevcpred_template.c
	libavcodec/version.h

cosmetics from hevc.h & hevc_ps.c mostly merged, other files left as they where in ffmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 17:13:00 +01:00
Michael Niedermayer
8b2dd04afc Merge commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb' 
* commit '0a9e94bba8f8a40156438a43e4fe0e9ae36236cb':
  webp: stop using deprecated avcodec_set_dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 15:55:58 +01:00
Michael Niedermayer
98ca3fb9cf Merge commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be' 
* commit '757d5e8ef98ba2ab0dd0e85a46290c4f4a7e82be':
  vp8: stop using deprecated avcodec_set_dimensions
  vp56: stop using deprecated avcodec_set_dimensions
  vp3: stop using deprecated avcodec_set_dimensions
  txd: stop using deprecated avcodec_set_dimensions
  truemotion1: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/txd.c
	libavcodec/vp56.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 15:49:58 +01:00
Michael Niedermayer
ffd100b111 Merge commit 'c265b8bb7638546919465e3585441b1d40c4b13d' 
* commit 'c265b8bb7638546919465e3585441b1d40c4b13d':
  tiff: stop using deprecated avcodec_set_dimensions
  targa: stop using deprecated avcodec_set_dimensions
  svq1dec: stop using deprecated avcodec_set_dimensions
  sunrast: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/sunrast.c
	libavcodec/targa.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 15:43:29 +01:00
Michael Niedermayer
7630e564ca Merge commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934' 
* commit 'c755870d52c8c29676e5ba7ee9557adf4a7ca934':
  sgidec: stop using deprecated avcodec_set_dimensions
  rv34: stop using deprecated avcodec_set_dimensions
  rv10: stop using deprecated avcodec_set_dimensions
  ptx: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/ptx.c
	libavcodec/rv10.c
	libavcodec/sgidec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 15:34:49 +01:00
Michael Niedermayer
a897ba33e8 Merge commit '0f21d8b1b40848973558c737aebe800c46e93a3d' 
* commit '0f21d8b1b40848973558c737aebe800c46e93a3d':
  pictordec: stop using deprecated avcodec_set_dimensions
  pgssubdec: stop using deprecated avcodec_set_dimensions
  pcx: stop using deprecated avcodec_set_dimensions
  mpegvideo_parser: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/pcx.c
	libavcodec/pgssubdec.c
	libavcodec/pictordec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 15:25:09 +01:00
Michael Niedermayer
64a0ed190e Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089' 
* commit '13207484bba8a8b78b40d5a22da8c9c555429089':
  mpeg4video_parser: stop using deprecated avcodec_set_dimensions
  mpeg12dec: stop using deprecated avcodec_set_dimensions
  mjpegdec: stop using deprecated avcodec_set_dimensions
  libvpxdec: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/mjpegdec.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4video_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 15:14:52 +01:00
Michael Niedermayer
bf92cd8178 Merge commit '967cd6fafbf2fdec9cbe011296ad34a70212427e' 
* commit '967cd6fafbf2fdec9cbe011296ad34a70212427e':
  libopenjpegdec: stop using deprecated avcodec_set_dimensions
  kgv1dec: stop using deprecated avcodec_set_dimensions
  ivi_common: stop using deprecated avcodec_set_dimensions
  indeo3: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/ivi_common.c
	libavcodec/kgv1dec.c
	libavcodec/libopenjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 15:07:25 +01:00
Michael Niedermayer
e6b9d71ad9 Merge commit '3b086317277e3f3b61c0343930d8e2570b278bd6' 
* commit '3b086317277e3f3b61c0343930d8e2570b278bd6':
  h26[13]dec: stop using deprecated avcodec_set_dimensions
  gifdec: stop using deprecated avcodec_set_dimensions
  g2meet: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/gifdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 14:54:40 +01:00
Michael Niedermayer
bf688d23b5 Merge commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8' 
* commit 'ec7063005ee67c0b4d4b83aa5118dd22ad1094e8':
  eatqi: stop using deprecated avcodec_set_dimensions
  eatgv: stop using deprecated avcodec_set_dimensions
  eatgq: stop using deprecated avcodec_set_dimensions
  eamad: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/eamad.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 14:09:17 +01:00
Michael Niedermayer
4a35651267 Merge commit 'd6da372984c87fd6288c148c291065d6032ceda3' 
* commit 'd6da372984c87fd6288c148c291065d6032ceda3':
  eacmv: stop using deprecated avcodec_set_dimensions
  dvdsubdec: stop using deprecated avcodec_set_dimensions
  dvdec: stop using deprecated avcodec_set_dimensions
  dpx: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/dpx.c
	libavcodec/dvdec.c
	libavcodec/dvdsubdec.c
	libavcodec/eacmv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 14:01:02 +01:00
Michael Niedermayer
f016a23c7f Merge commit 'c7a5acabc537c2ce363165c31250aba341b1a990' 
* commit 'c7a5acabc537c2ce363165c31250aba341b1a990':
  dnxhddec: stop using deprecated avcodec_set_dimensions
  dirac: stop using deprecated avcodec_set_dimensions
  cdxl: stop using deprecated avcodec_set_dimensions
  avs: stop using deprecated avcodec_set_dimensions

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 13:40:04 +01:00
Michael Niedermayer
5ef0c00580 Merge commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5' 
* commit '78780c8bf6246a1cf1cd0c9096b49dc082a6a8e5':
  ansi: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/ansi.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 13:28:33 +01:00
Michael Niedermayer
66f436adf5 Merge commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213' 
* commit '0f6c1d6d64c9f6255ea579dace27d0dd695f0213':
  lavc/utils: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 13:21:14 +01:00
Michael Niedermayer
7b91e9cf5d Merge commit '7644f5a80787c9b608b82873604805d7e38a6a18' 
* commit '7644f5a80787c9b608b82873604805d7e38a6a18':
  lavc: replace avcodec_set_dimensions with ff_set_dimensions

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 13:07:15 +01:00
Michael Niedermayer
f62dfed3de h264: simplify frame_recovered code 
This is a separate commit to ease future bisecting in case it breaks something.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 12:59:40 +01:00
Michael Niedermayer
78265fcfee Merge commit '28096e0a806e57376541e6222d315619906e3c55' 
* commit '28096e0a806e57376541e6222d315619906e3c55':
  h264: wait for initial complete frame before outputing frames

Conflicts:
	doc/APIchanges
	libavcodec/h264.c
	libavcodec/mpegvideo.h
	libavutil/frame.h
	libavutil/version.h

See: a64b028aeb (as well as various later commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 12:59:08 +01:00
Michael Niedermayer
a2bfee36b7 Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e' 
* commit '9af7a8523a6bb517834ebed36093bdab11a8b38e':
  HNM4/HNM4A demuxer & video decoder

Conflicts:
	Changelog
	doc/general.texi
	libavcodec/Makefile
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile
	libavformat/allformats.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 10:46:39 +01:00
Michael Niedermayer
ec5e02d495 avcodec/wmv2enc: Collect statistics for 2 pass encoding 
Fixes Ticket3053

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-11-01 00:40:33 +01:00
Compn
6173b0fea7 aacdec: fix small comment, update decoder features comment 2013-10-31 15:57:16 -04:00
Anton Khirnov
28240a60c1 lavc: move FF_ASPECT_EXTENDED from avcodec.h to h263.h 
It's for internal use only.
 2013-10-31 20:24:48 +01:00
Anton Khirnov
eb5920c195 lavc: deprecate unused FF_BUG_OLD_MSMPEG4 2013-10-31 20:24:30 +01:00
Anton Khirnov
0300962b76 lavc: schedule FF_BUG_AC_VLC for removal on the next major bump. 
It has been deprecated/unused for about 10 years.
 2013-10-31 20:23:42 +01:00
Anton Khirnov
f8b2bcd2ad lavc: deprecate FF_DEBUG_VIS_* 
Those flags have no effect since
37045e4229.
 2013-10-31 20:23:08 +01:00
Anton Khirnov
a1504eee41 lavc: deprecate AVCodecContext.debug_mv 
It has been unused since 37045e4229.
 2013-10-31 20:22:51 +01:00
Anton Khirnov
ccc7129845 lavc: deprecate FF_DEBUG_MV and remove all traces of its use 
It has not been actually used since
37045e4229, when the broken vismv code was
removed.
 2013-10-31 20:21:13 +01:00
Guillaume Martres
064698d381 Add HEVC decoder 
Initially written by Guillaume Martres <smarter@ubuntu.com> as a GSoC
project. Further contributions by the OpenHEVC project and other
developers, namely:

Mickaël Raulet <mraulet@insa-rennes.fr>
Seppo Tomperi <seppo.tomperi@vtt.fi>
Gildas Cocherel <gildas.cocherel@laposte.net>
Khaled Jerbi <khaled_jerbi@yahoo.fr>
Wassim Hamidouche <wassim.hamidouche@insa-rennes.fr>
Vittorio Giovara <vittorio.giovara@gmail.com>
Jan Ekström <jeebjp@gmail.com>
Anton Khirnov <anton@khirnov.net>
Martin Storsjö <martin@martin.st>
Luca Barbato <lu_zero@gentoo.org>
Yusuke Nakamura <muken.the.vfrmaniac@gmail.com>
Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diego Biurrun <diego@biurrun.de>

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-31 20:19:59 +01:00
Carl Eugen Hoyos
5ab1efb9d0 Fix a crash on oom when decoding hevc. 2013-10-31 20:17:18 +01:00
Anton Khirnov
0a9e94bba8 webp: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
757d5e8ef9 vp8: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
c265b8bb76 tiff: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
c755870d52 sgidec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
0f21d8b1b4 pictordec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
2e0ab4d314 vp56: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
eed5a478ba targa: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
1d389e2a80 rv34: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
41ad353dcf pgssubdec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
b53febc1c0 vp3: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
7fbb75cc70 svq1dec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
ce9f5b13ed rv10: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
0679416269 pcx: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
3cfdb912cb txd: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
9c0ece1b4f sunrast: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
e7ea97039d ptx: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
6da9c9d381 mpegvideo_parser: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
db92e4ea8d truemotion1: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:16 +01:00
Anton Khirnov
13207484bb mpeg4video_parser: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
967cd6fafb libopenjpegdec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
3b08631727 h26[13]dec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
ec7063005e eatqi: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
d6da372984 eacmv: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
c7a5acabc5 dnxhddec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
6c7254722a mpeg12dec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
d62b24a3f6 kgv1dec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
8255535c5f gifdec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
a87739388d eatgv: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
babbec0867 dvdsubdec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
e9cfbc2b53 dirac: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
2cd94ad5bf mjpegdec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
d184cd1dac ivi_common: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
58c6239e85 g2meet: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
06e7a20244 eatgq: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
caeed8deeb dvdec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
b870582485 libvpxdec: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
317d6a1503 indeo3: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
c6b8a7dbb4 eamad: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
8451b5f00a dpx: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:15 +01:00
Anton Khirnov
78780c8bf6 ansi: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:14 +01:00
Anton Khirnov
0f6c1d6d64 lavc/utils: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:14 +01:00
Anton Khirnov
7644f5a807 lavc: replace avcodec_set_dimensions with ff_set_dimensions 
avcodec_set_dimensions() is supposed to be an internal utility function,
there is no reason whatsoever for it to be public. Therefore deprecate
it.
 2013-10-31 20:14:14 +01:00
John Stebbins
28096e0a80 h264: wait for initial complete frame before outputing frames 
This can be optionally disabled whith the "output_corrupt" flags
option.  When in "output_corrupt" mode, incomplete frames are
signalled through AVFrame.flags FRAME_FLAG_INCOMPLETE_FRAME.

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-10-31 20:14:14 +01:00
Anton Khirnov
d57e95cbd4 cdxl: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:14 +01:00
Anton Khirnov
f176e11cff avs: stop using deprecated avcodec_set_dimensions 2013-10-31 20:14:14 +01:00
David Kment
9af7a8523a HNM4/HNM4A demuxer & video decoder 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-10-31 17:45:46 +01:00
Michael Niedermayer
fa6fa2162b avcodec/cabac: support UNCHECKED_BITSTREAM_READER = 0 
Fixes overreads in HEVC
Fixes Ticket3070
Also fixed remaining issues from Ticket3075 and Ticket3076

Some lines of code taken from  0c5f839693da2276c2da23400f67a67be4ea0af1:libavcodec/x86/cabac.h
and                            0c5f839693da2276c2da23400f67a67be4ea0af1:libavcodec/cabac_functions.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-31 11:13:27 +01:00
Mickaël Raulet
7c8b65f688 hevc: add partial support for interlaced(cherry picked from commit 44b592ae6d323445c076ef3ec966ebf9daa8bccf) 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-31 10:00:22 +01:00
Michael Niedermayer
cb52d6da0a avcodec/bink: fix seeking to frame 0 
Fixes Ticket3088

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 23:56:52 +01:00
Michael Niedermayer
cc0e47b550 avcodec/jpeglsdec: check err value for ls_get_code_runterm() 
Fixes infinite loop
Fixes Ticket3086

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 23:32:51 +01:00
Michael Niedermayer
18802942d1 avcodec/mpeg12dec: Use skip_1stop_8data_bits() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 21:29:21 +01:00
Michael Niedermayer
f031531816 avcodec/vaapi_mpeg2: Use skip_1stop_8data_bits() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 18:28:00 +01:00
Michael Niedermayer
9c7662aeba avcodec/svq3: Use skip_1stop_8data_bits() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 18:28:00 +01:00
Michael Niedermayer
c882b62d14 avcodec/svq1dec: Use skip_1stop_8data_bits() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 18:28:00 +01:00
Michael Niedermayer
f4d3127197 avcodec/ituh263dec: Use skip_1stop_8data_bits() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 18:28:00 +01:00
Michael Niedermayer
ddc6ed9187 avcodec/intelh263dec: Use skip_1stop_8data_bits() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 18:28:00 +01:00
Michael Niedermayer
711e981276 avcodec/h261dec: Use skip_1stop_8data_bits() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 18:28:00 +01:00
Michael Niedermayer
9c284a8e19 avcodec/flvdec: Use skip_1stop_8data_bits() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 18:28:00 +01:00
Michael Niedermayer
34087b0564 avcodec/dxva2_mpeg2: Use skip_1stop_8data_bits() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 18:28:00 +01:00
Michael Niedermayer
44e8e82d34 avcodec/get_bits: add skip_1stop_8data_bits 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 18:22:03 +01:00
Michael Niedermayer
94a80e36d3 avcodec/intelh263dec: make while get_bits loop more robust by checking bits left 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 15:01:00 +01:00
Michael Niedermayer
810f9c5eaa avcodec/ituh263dec: make while get_bits loop more robust by checking bits left 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 15:00:38 +01:00
Michael Niedermayer
489c575bd6 avcodec/ivi_common: make while get_bits loop more robust by checking bits left 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 14:59:00 +01:00
Michael Niedermayer
4b12930f79 avcodec/flacdec: use get_unary() simplify code 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 14:58:04 +01:00
Michael Niedermayer
719dbe86ea avcodec/h261dec: make while get_bits loop more robust by checking bits left 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 14:45:39 +01:00
Michael Niedermayer
b0f8b5c819 avcodec/flvdec: make while get_bits loop more robust by checking bits left 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 14:39:31 +01:00
Michael Niedermayer
9f5b75f241 avcodec/flacdec: make while get_bits loop more robust by checking bits left 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 14:39:31 +01:00
Paul B Mahol
65988b9916 avcodec/cook: fix deadlock by using get_unary() 
Fixes #3089.
Reported-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 13:26:55 +00:00
Paul B Mahol
387e76f993 avcodec/mdec: use dsp.bswap16_buf() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 12:41:43 +00:00
Paul B Mahol
268d0d6e6c avcodec/svq3: use av_fast_padded_malloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:07 +00:00
Paul B Mahol
8e609eb475 avcodec/utvideoenc: use av_fast_padded_malloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:07 +00:00
Paul B Mahol
82e576046c avcodec/wavpack: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:07 +00:00
Paul B Mahol
49c6f0ae15 avcodec/apedec: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:06 +00:00
Paul B Mahol
2508fa10c6 avcodec/xan: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:06 +00:00
Paul B Mahol
1de8dfcbc4 avcodec/binkaudio: use init_get_bits8() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:06 +00:00
Paul B Mahol
2820562935 avcodec/4xm: use av_fast_padded_malloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:06 +00:00
Paul B Mahol
c783bec6dc avcodec/mdec: use av_fast_padded_malloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:05 +00:00
Paul B Mahol
62ef736f5a avcodec/motionpixels: use av_fast_padded_malloc() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-30 11:04:05 +00:00
Michael Niedermayer
558784f113 Merge commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9' 
* commit 'b9589f5a770ec2357ab7920a5fabe8510b8601f9':
  lavc: add error checking to apply_param_change.

Conflicts:
	libavcodec/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 10:23:24 +01:00
Michael Niedermayer
4427fe7e4b Merge commit '5c0a09839c707f10e5dba59460e219e989c1da93' 
* commit '5c0a09839c707f10e5dba59460e219e989c1da93':
  libopenjpegdec: return meaningful error codes

Conflicts:
	libavcodec/libopenjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 09:33:46 +01:00
Anton Khirnov
b9589f5a77 lavc: add error checking to apply_param_change. 2013-10-30 08:43:03 +01:00
Anton Khirnov
5c0a09839c libopenjpegdec: return meaningful error codes 2013-10-30 08:42:41 +01:00
Michael Niedermayer
e1848aa469 avcodec/mpeg12dec: forward errors when EXPLODE is set 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-30 02:08:34 +01:00
Stefano Sabatini
d4ac3e5934 lavc/mpegvideo_enc: fix typo 2013-10-29 18:36:21 +01:00
Stefano Sabatini
9fa0dccca6 lavc: extend documentation for the "bf" option 2013-10-29 18:30:27 +01:00
Michael Niedermayer
ce55e667fa avcodec/mpegvideo_enc: check that max_b_frames is not negative 
Fixes crash found by saste
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 16:13:07 +01:00
Derek Buitenhuis
58d13cea30 h264: Check all allocations 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-29 14:00:29 +00:00
Derek Buitenhuis
a483aae7d8 h264: Check all allocations 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-10-29 12:00:27 +00:00
Michael Niedermayer
e36231969a avcodec/audioconvert: deprecate API 
Note, the header was not installed so useage of this should be limited
but its not 0, there are some random pieces of code using it according
to google.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-29 10:48:57 +01:00
Paul B Mahol
66518f6feb avcodec/cook: use av_freep() 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-10-29 09:37:59 +00:00
Michael Niedermayer
e510171f31 avcodec: fix old codec ids 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 23:54:28 +01:00
Michael Niedermayer
f0b26bf0f5 avcodec/dvdec: dont try to decode ac when theres no input 
fixes reading out of an empty bitstream

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 23:09:35 +01:00
Michael Niedermayer
c00686518c avcodec/h263dec: fix handling of AV_EF_EXPLODE 
This fixes checking a variable that had been overwritten before.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 17:05:59 +01:00
Anton Khirnov
c9a13a289d lavc: remove old unused audio conversion functions. 2013-10-28 15:29:37 +01:00
Michael Niedermayer
17e47ec8be Merge commit 'a1c5cc429d99216406170eac7e8352860076d3e8' 
* commit 'a1c5cc429d99216406170eac7e8352860076d3e8':
  lavc: don't set AVFrame.pts to random numbers in decoders.

Conflicts:
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 14:12:37 +01:00
Michael Niedermayer
6c82c87dbb ac3dec: fix outptr increment. 
Fixes corrupt data errors when downmixing in the AC-3 decoder.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>

CC:libav-stable@libav.org
 2013-10-28 08:33:21 -04:00
Michael Niedermayer
683ab5fec9 Merge commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc' 
* commit 'f2521563d1a0c3e2a21892f59f3327b82b3db7fc':
  g722dec: Change bits_per_codeword to the right option type

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 13:21:17 +01:00
Michael Niedermayer
252f56636c Merge commit '97de206b44a48da726807cc3e7b9448a8112760b' 
* commit '97de206b44a48da726807cc3e7b9448a8112760b':
  lavc: disable CRC checking by default

Conflicts:
	libavcodec/options_table.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 12:47:10 +01:00
Michael Niedermayer
84f972f994 Merge commit '23a211cbba0b7c9ee694040031b2e5da1be54a00' 
* commit '23a211cbba0b7c9ee694040031b2e5da1be54a00':
  lavc: change all decoders to behave consistently with AV_EF_CRCCHECK.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/tta.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 12:34:35 +01:00
Michael Niedermayer
a66ee3dc87 Merge commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185' 
* commit 'aaaf2dc023d31f30eeec874f24b50f44b9295185':
  h263: Check init_get_bits return value

Conflicts:
	libavcodec/h263dec.c

See: d47e14b53a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 12:09:12 +01:00
Michael Niedermayer
d57a6fe6ab Merge commit '0749314886390f6ec81d45e0ba424fcb36c945cf' 
* commit '0749314886390f6ec81d45e0ba424fcb36c945cf':
  h263: Return meaningful errors

Conflicts:
	libavcodec/h263dec.c

See: 7b62d3415e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 11:54:46 +01:00
Michael Niedermayer
ac3fa95e73 Merge commit '94603feb1b3ad01a821a1a1cef1570b13f471821' 
* commit '94603feb1b3ad01a821a1a1cef1570b13f471821':
  h264_ps: when parsing a VUI fails, only abort when explode is set

Merge only for metadata, ignoring invalid data can put the context
into an invalid state and can possibly be used for remote code
execution exploits.
Also we support all non standard VUIs that have been reported so
ignoring parsing failure makes no sense for us unless theres
some issue that has not been reported

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 11:08:58 +01:00
Mickaël Raulet
a21839149c hevc: add profile idc warning 
(cherry picked from commit 15f7a481fd19529b13631bfff5b3d65bfe5729d5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 10:37:11 +01:00
Anton Khirnov
cb148e56dc hevc: refactor pic_arrays and set_sps 
(cherry picked from commit a6686c6d83b50c0962269f2c487f4f0c57e0df79)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 10:37:10 +01:00
Anton Khirnov
4db81f0817 hevc: add irap checks 
(cherry picked from commit 3d3bbe35541a308937d0fe72b20a1c29d1c4100d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 10:37:09 +01:00
Michael Niedermayer
8930637819 Merge commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da' 
* commit 'fc06ee6ee377cc3b512dff8f02057e26311bc4da':
  mmvideo: fix uninitialized variable use in mm_decode_intra

Conflicts:
	libavcodec/mmvideo.c

See: c2e3b564b3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-10-28 10:12:13 +01:00
Anton Khirnov
a1c5cc429d lavc: don't set AVFrame.pts to random numbers in decoders. 2013-10-28 09:28:29 +01:00
Martin Storsjö
f2521563d1 g722dec: Change bits_per_codeword to the right option type 
This isn't a set of flags but just a plain integer in the range
6-8.

Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-10-28 09:53:48 +02:00
Anton Khirnov
97de206b44 lavc: disable CRC checking by default 2013-10-28 07:22:43 +01:00