generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
53,355 Commits 24 Branches 241 Tags
Commit Graph

24063 Commits

Author SHA1 Message Date
Anton Khirnov
d03a94e2b7 lavc: remove disabled FF_API_SUB_ID cruft 2013-03-09 08:36:40 +01:00
Anton Khirnov
9d6cf81f02 lavc: remove disabled FF_API_COLOR_TABLE_ID cruft 2013-03-09 08:36:40 +01:00
Anton Khirnov
f073b1500e lavc: remove disabled FF_API_OLD_ENCODE_AUDIO cruft 2013-03-09 08:36:40 +01:00
Anton Khirnov
3b0f586f07 lavc: remove disabled FF_API_MPV_GLOBAL_OPTS cruft 2013-03-09 08:36:40 +01:00
Anton Khirnov
5d606863c3 lavc: remove disabled FF_API_OLD_DECODE_AUDIO cruft 2013-03-09 08:36:40 +01:00
Stephen Hutchinson
98c4268eca libutvideo: Prioritize compatibility with new versions 
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-03-08 20:45:49 -05:00
Justin Ruggles
486f0b0cfc png: use av_mallocz_array() for the zlib zalloc function 
Fixes valgrind uninitialized memory errors when decoding png.

CC:libav-stable@libav.org
 2013-03-08 14:52:21 -05:00
Justin Ruggles
e984f47873 libmp3lame: use the correct remaining buffer size when flushing 
CC:libav-stable@libav.org
 2013-03-08 14:52:05 -05:00
Clément Bœsch
160979f4b4 lavc/utils: make sure the iconv descriptor can be opened only once. 
This prevents trying to do some subtitles conversion for each event when
the character encoding is not found. It now aborts early instead of
flooding stderr.
 2013-03-08 20:51:57 +01:00
Michael Niedermayer
c4e8821732 Merge commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e' 
* commit '7ecc2d403ce5c7b6ea3b1f368dccefd105209c7e':
  Move AVFrame from lavc to lavu.

Conflicts:
	libavcodec/avcodec.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 20:33:26 +01:00
Michael Niedermayer
fee484edaf Merge commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327' 
* commit 'ad0c9f2d5d81e22207c6ccecc426bf7306acc327':
  lavc: move AVFrame.hwaccel_picture_private to Picture.

Conflicts:
	libavcodec/avcodec.h
	libavcodec/mpegvideo.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 19:35:37 +01:00
Michael Niedermayer
d9d97f9b33 Merge commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c' 
* commit '1a5e9130162b8adc898e5f6aea82b6372d1e4e6c':
  pthread: avoid copying input packets when possible.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 19:17:38 +01:00
Michael Niedermayer
2653e12520 Merge commit '1afddbe59e96af75f1c07605afc95615569f388f' 
* commit '1afddbe59e96af75f1c07605afc95615569f388f':
  avpacket: use AVBuffer to allow refcounting the packets.

Conflicts:
	libavcodec/avpacket.c
	libavcodec/utils.c
	libavdevice/v4l2.c
	libavformat/avidec.c
	libavformat/flacdec.c
	libavformat/id3v2.c
	libavformat/matroskaenc.c
	libavformat/mux.c
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 19:12:03 +01:00
Michael Niedermayer
e9fbb9783c Merge commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8' 
* commit 'dbd2a34ba5e5e46b6835e4425c360723c643b7a8':
  build: cosmetics: Group hw accelerator Makefile entries together

Conflicts:
	libavcodec/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 15:32:39 +01:00
Michael Niedermayer
c32cc7e3a4 Merge commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51' 
* commit 'bcd0a7137e4aca0f6f598593b90ca8f338444c51':
  configure: Add missing h264chroma dependencies to vp5, vp6
  Add missing error_resilience includes to files that use ER

Conflicts:
	configure
	libavcodec/mpeg12.c
	libavcodec/mpeg4videodec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 15:23:56 +01:00
Michael Niedermayer
43c6c18690 Merge commit 'd88738e4038b162708dc2f5342e10c1694edfd89' 
* commit 'd88738e4038b162708dc2f5342e10c1694edfd89':
  mpegvideo: Conditionally build error_resilience bits

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 15:17:25 +01:00
Michael Niedermayer
6c17ff84ad Merge commit 'efa7f4202088c70caba11d7834641bc6eaf41830' 
* commit 'efa7f4202088c70caba11d7834641bc6eaf41830':
  Use the avstring.h locale-independent character type functions
  avstring: Add locale independent versions of some ctype.h functions

Conflicts:
	avprobe.c
	doc/APIchanges
	libavcodec/dvdsubdec.c
	libavcodec/utils.c
	libavutil/avstring.c
	libavutil/avstring.h
	libavutil/eval.c
	libavutil/parseutils.c
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 14:57:41 +01:00
Michael Niedermayer
eab49f4fb5 Revert "aacdec: Reconfigure output as needed, disable pop_output_configuration()" 
This reverts commit 60dbf2eff92f8aa4683b6dcaba9e694890258ade.

This is not needed anymore, Ticket 1694 has been fixed differently
 2013-03-08 14:21:40 +01:00
Michael Niedermayer
8978c743fb aacsbr: Check for envelope scalefactors overflowing 
This prevents various values from becoming stuck at NAN and
output to become silent
If someone knows a cleaner solution, thats welcome!

Fixes Ticket2335

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-08 14:21:40 +01:00
Anton Khirnov
7c45087b84 lavc: update the fallback versions of ff_thread_* 
Fixes build without threads after
759001c534287a96dc96d1e274665feb7059145d.
 2013-03-08 10:22:10 +01:00
Yusuke Nakamura
19dd4017ab libopencore-amr: Add the missing 3rd argument of ff_get_buffer() 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-03-08 11:09:31 +02:00
Anton Khirnov
f86d66bcfa vmdaudio: fix invalid reads when packet size is not a multiple of chunk size 
CC:libav-stable@libav.org
 2013-03-08 08:12:41 +01:00
Anton Khirnov
4c0080b7e7 wmaprodec: return an error, not 0, when the input is too small. 
Returning 0 may result in an infinite loop in valid calling programs. A
decoder should never return 0 without producing any output.

CC:libav-stable@libav.org
 2013-03-08 08:12:26 +01:00
Anton Khirnov
cacad1c058 wmaprodec: require block_align to be set. 
Avoids an infinite loop in the calling programs with decoder not
consuming any input and not returning output.

CC:libav-stable@libav.org
 2013-03-08 08:12:16 +01:00
Anton Khirnov
ea1136baaf wmadec: require block_align to be set. 
Avoids an infinite loop in the calling programs with decoder not
consuming any input and not returning output.

CC:libav-stable@libav.org
 2013-03-08 08:12:03 +01:00
Anton Khirnov
3ba40ebb6c ivi_common: do not call MC for intra frames when dc_transform is unset 
CC:libav-stable@libav.org
 2013-03-08 08:11:46 +01:00
Anton Khirnov
3e2f200237 roqvideodec: fix a potential infinite loop in roqvideo_decode_frame(). 
When there is just 1 byte remanining in the buffer, nothing will be read
and the loop will continue forever. Check that there are at least 8
bytes, which are always read at the beginning.

CC:libav-stable@libav.org
 2013-03-08 08:11:35 +01:00
Anton Khirnov
8a49d2bcbe xxan: fix invalid memory access in xan_decode_frame_type0() 
The loop a few lines below the xan_unpack() call accesses up to
dec_size * 2 bytes into y_buffer, so dec_size must be limited to
buffer_size / 2.

CC:libav-stable@libav.org
 2013-03-08 08:11:22 +01:00
Anton Khirnov
d243896987 ffv1: fix calculating slice dimensions for version 2 
It got broken in 0f13cd3187192ba0cc2b043430de6e279e7b97c3.

CC:libav-stable@libav.org
 2013-03-08 08:10:02 +01:00
Anton Khirnov
7b89cd20d8 eamad: allocate a dummy reference frame when the real one is missing 
CC:libav-stable@libav.org
 2013-03-08 08:09:51 +01:00
Anton Khirnov
542b83fc90 Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*. 2013-03-08 07:42:09 +01:00
Anton Khirnov
d8b31be6ca Add the bumps and APIchanges entries for reference counted buffers changes. 2013-03-08 07:41:49 +01:00
Anton Khirnov
8df23e938b lavc: postpone the removal of request_channels API. 
Its replacement is still not ready.
 2013-03-08 07:41:42 +01:00
Anton Khirnov
ddcca4ba07 lavc: stop setting AVFrame.motion_subsample_log2 
It is not used inside lavc anywhere and now it makes no sense to export
it.
 2013-03-08 07:41:14 +01:00
Anton Khirnov
37045e4229 mpegvideo: drop vismv code 
It has been broken for over a year without anyone complaining or
noticing, thus proving that nobody ever uses it.
 2013-03-08 07:40:41 +01:00
Anton Khirnov
2eba9087f3 lavc: make up a fake frame channel layout when there is no real one. 
This should ensure that a valid channel layout is always set on a frame,
until a better solution is implemented.
 2013-03-08 07:40:06 +01:00
Anton Khirnov
192f1984b1 lavc: limit maximum number of channels to 63 
This is the most that can be represented with the current channel layout
system. This limit should be raised/removed when a better system is
implemented.
 2013-03-08 07:39:53 +01:00
Anton Khirnov
15ec0450b4 lavc: allow decoders to override frame parameters. 2013-03-08 07:39:44 +01:00
Anton Khirnov
3b199d29cd lavc decoders: properly initialize AVFrame. 2013-03-08 07:39:37 +01:00
Anton Khirnov
759001c534 lavc decoders: work with refcounted frames. 2013-03-08 07:38:30 +01:00
Anton Khirnov
6e7b50b427 mpegvideo_enc: drop support for reusing the input motion vectors. 
This misfeature is most likely completely useless and conflicts with
removing the mpegvideo-specific fields from AVFrame. In the improbable
case it is actually useful, it should be reimplemented in a better way.
 2013-03-08 07:37:45 +01:00
Anton Khirnov
7ecc2d403c Move AVFrame from lavc to lavu. 
Add AVBuffer-based reference counting API to it.
 2013-03-08 07:36:15 +01:00
Anton Khirnov
ad0c9f2d5d lavc: move AVFrame.hwaccel_picture_private to Picture. 
This field is private and should not be present in a public struct. It
is only used in DXVA with mpegvideo-based decoders currently.
 2013-03-08 07:36:01 +01:00
Anton Khirnov
1a5e913016 pthread: avoid copying input packets when possible. 2013-03-08 07:35:14 +01:00
Anton Khirnov
1afddbe59e avpacket: use AVBuffer to allow refcounting the packets. 
This will allow us to avoid copying the packets in many cases.

This breaks ABI.
 2013-03-08 07:33:45 +01:00
Alexander Kojevnikov
eae0879d96 mp3dec: Fix VBR bit rate parsing 
When parsing the Xing/Info tag, don't set the bit rate if it's an Info tag.

When parsing the stream, don't override the bit rate if it's already set,
otherwise calculate the mean bit rate from parsed frames. This way, the bit
rate will be set correctly both for CBR and VBR streams.

CC:libav-stable@libav.org

Signed-off-by: Anton Khirnov <anton@khirnov.net>
 2013-03-08 07:32:11 +01:00
Alexander Kojevnikov
d30ee5ef59 mpegaudio_parser: Don't ignore information from the first frame 
Signed-off-by: Alexander Kojevnikov <alexander@kojevnikov.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-07 23:07:04 +01:00
Michael Niedermayer
60dbf2eff9 aacdec: Reconfigure output as needed, disable pop_output_configuration() 
Fixes Ticket1694

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-07 19:50:31 +01:00
Michael Niedermayer
fee5da6b0a psymodel: dont apply lowpass filters with a cutoff close to the nyquist 
The IIR filter numerically diverges in such cases, this could easily be
fixed but would make the filter slower on some platforms

Fixes Ticket2246

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-03-07 19:28:30 +01:00
Diego Biurrun
dbd2a34ba5 build: cosmetics: Group hw accelerator Makefile entries together 2013-03-07 15:36:21 +01:00