generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
67,175 Commits 24 Branches 241 Tags 173 MiB
e7513e1286
Commit Graph

67175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
e7513e1286 avformat: Read errno before av_log() as the callback from av_log() might affect errno 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 13:48:56 +02:00
Michael Niedermayer
af03ba9aa2 avformat/hdsenc: Read errno before av_log() as the callback from av_log() might affect errno 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 13:28:51 +02:00
Michael Niedermayer
0d96d44c4f avfilter: Read errno before av_log() as the callback from av_log() might affect errno 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 13:28:51 +02:00
Michael Niedermayer
a630969535 avdeviece: Read errno before av_log() as the callback from av_log() might affect errno 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 13:28:51 +02:00
Michael Niedermayer
dd5c2fe177 avcodec: Read errno before av_log() as the callback from av_log() might affect errno 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 13:28:51 +02:00
Michael Niedermayer
2fc970a6b8 cmdutils: Read errno before av_log() as the callback from av_log() might affect errno 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 13:28:51 +02:00
Michael Niedermayer
92d366f6ab avformat: Print error message on failure of ff_rename() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 13:28:51 +02:00
Michael Niedermayer
eeb9242b62 Merge commit '50dbe6b3544fa64d5611e16553bf542fd71276b8' 
* commit '50dbe6b3544fa64d5611e16553bf542fd71276b8':
  mov: fix assigment check

Conflicts:
	libavformat/mov.c

See: af2e5061bb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 04:57:48 +02:00
Michael Niedermayer
48579041ba Merge commit '7df3b426bbfbd7efd9a0f56393e3cc78413b0869' 
* commit '7df3b426bbfbd7efd9a0f56393e3cc78413b0869':
  mxfenc: Fix possible integer overflows

Conflicts:
	libavformat/mxfenc.c

See: e3ba817b95
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 04:55:17 +02:00
Michael Niedermayer
5408d8828a Merge commit 'ad6b00d85f686324aa2bd93e39261fa1d411f141' 
* commit 'ad6b00d85f686324aa2bd93e39261fa1d411f141':
  mxfdec: add missing break

See: cbda76c7c6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 04:53:01 +02:00
Michael Niedermayer
8be93ba049 Merge commit '28c020d4df9b060a58a124a7a5406d4313fbe249' 
* commit '28c020d4df9b060a58a124a7a5406d4313fbe249':
  matroskaenc: check avio_open_dyn_buf return value

Conflicts:
	libavformat/matroskaenc.c

See: b1f517f503
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 04:45:23 +02:00
Michael Niedermayer
3ae818f6ab Merge commit 'e0caa1eb4e518111a81801db0d2ccdd2733ba94b' 
* commit 'e0caa1eb4e518111a81801db0d2ccdd2733ba94b':
  matroskadec: check return values

Conflicts:
	libavformat/matroskadec.c

See: 1116491c53
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 04:37:27 +02:00
Michael Niedermayer
45fd593531 Merge commit '3c1199c3c4cbdb4ffff0de89f06d5a08acefe356' 
* commit '3c1199c3c4cbdb4ffff0de89f06d5a08acefe356':
  matroskadec: fix leak on error

Conflicts:
	libavformat/matroskadec.c

See: 2fe4b6210c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 04:32:16 +02:00
Michael Niedermayer
97a8f4dd11 Merge commit '7785ce1c769369abf85b276148548a5510aabb5f' 
* commit '7785ce1c769369abf85b276148548a5510aabb5f':
  lavf: replace rename() with ff_rename()

Conflicts:
	libavformat/hdsenc.c
	libavformat/internal.h

See: 95d2fc6a76
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 04:24:16 +02:00
Michael Niedermayer
af89c14418 Merge commit '0b66fb4505e0bb43de3797f63f3290f0188d67cc' 
* commit '0b66fb4505e0bb43de3797f63f3290f0188d67cc':
  flac_picture: prevent a possible out of bound write

This is only partly merged, the condition this checks for
is impossible to be true as it would imply avio_read() to
read more than the size passed to it

See: 731f7eaaad
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 04:03:41 +02:00
Michael Niedermayer
d609566270 Merge commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a' 
* commit 'f1ed83e23add1c26c50b146727e4c2399dfc0b3a':
  img2dec: check av_new_packet return value

Conflicts:
	libavformat/img2dec.c

See: 3f8148911c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 03:37:21 +02:00
Michael Niedermayer
6d2a2bfb59 Merge commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d' 
* commit '1967cd4e4c1cd96dfa195ce14e4b212ddb70586d':
  audiointerleave: check av_new_packet return value

Conflicts:
	libavformat/audiointerleave.c

See: 3ca8a23288
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 03:27:13 +02:00
Michael Niedermayer
1945db1f13 Merge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435' 
* commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435':
  avfilter: check filter link validity

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 03:08:19 +02:00
Vittorio Giovara
50dbe6b354 mov: fix assigment check 
CC: libav-stable@libav.org
Bug-Id: CID 1197050
 2014-10-24 23:48:57 +01:00
Tomas Härdin
7df3b426bb mxfenc: Fix possible integer overflows 
None of these are likely unless the user is writing a file with two billion
streams or a duration of around two months.

CC: libav-stable@libav.org
Bug-Id: CID 700568 / CID 700569 / CID 700570 /
        CID 700571 / CID 700572 / CID 700573
 2014-10-24 23:48:57 +01:00
Vittorio Giovara
ad6b00d85f mxfdec: add missing break 
CC: libav-stable@libav.org
Bug-Id: CID 732232
 2014-10-24 23:48:57 +01:00
Vittorio Giovara
28c020d4df matroskaenc: check avio_open_dyn_buf return value 
CC: libav-stable@libav.org
Bug-Id: CID 703629
 2014-10-24 23:48:57 +01:00
Vittorio Giovara
e0caa1eb4e matroskadec: check return values 
CC: libav-stable@libav.org
Bug-Id: CID 733712
 2014-10-24 23:48:51 +01:00
Vittorio Giovara
3c1199c3c4 matroskadec: fix leak on error 
CC: libav-stable@libav.org
Bug-Id: CID 1026767
 2014-10-24 23:43:25 +01:00
Luca Barbato
7785ce1c76 lavf: replace rename() with ff_rename() 
The new function wraps errno so that its value is correctly reported
when other functions overwrite it (eg. in case of logging).

CC: libav-stable@libav.org
Bug-Id: CID 1135748
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
 2014-10-24 23:42:53 +01:00
Vittorio Giovara
0b66fb4505 flac_picture: prevent a possible out of bound write 
At "mimetype[len] = 0;" mimetype is a 64 element array and len might be
equal to or greater than that.

CC: libav-stable@libav.org
Bug-Id: CID 1061055
 2014-10-24 23:42:53 +01:00
Vittorio Giovara
f1ed83e23a img2dec: check av_new_packet return value 
CC: libav-stable@libav.org
Bug-Id: CID 1087077
 2014-10-24 23:42:53 +01:00
Vittorio Giovara
1967cd4e4c audiointerleave: check av_new_packet return value 
CC: libav-stable@libav.org
Bug-Id: CID 1087078
 2014-10-24 23:42:53 +01:00
Vittorio Giovara
ac84c1ce24 avfilter: check filter link validity 
Remove now redundant check.

CC: libav-stable@libav.org
Bug-Id: CID 700371
 2014-10-24 23:42:19 +01:00
Michael Niedermayer
4ef02ddd81 Changelog: add entry for libutvideo 422P10 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 00:22:04 +02:00
Michael Niedermayer
59a4792830 avcodec/libutvideodec: Support YUV422P10 
Based on ConvertToPlanar() from libutvideo
libutvideo sadly does not seem to support exporting its internal planar buffers

Reviewed-by: Benoit Fouet <benoit.fouet@free.fr>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-25 00:15:15 +02:00
Eric Zimmerman
4ba5420e4d Added support for G2M5 codec 
This has also been independently found and fixed similarly by carl in
f4a3bbf4a3cd375121ea2495817f3e50e831ed48
The 2nd magic check is taken from carls implementation

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 19:36:09 +02:00
Michael Niedermayer
4641ae352e avformat: Add and use ff_copy_whitelists() 
Fixes potential security issue in case of running out of memory

Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 19:23:23 +02:00
Benoit Fouet
e56425d1a7 avcodec/aacdec: warn user when remapping streams. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 18:54:06 +02:00
Michael Niedermayer
279b2a4deb avformat/mp3dec: also accept Lavc as shortname to read delays 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 18:06:26 +02:00
Michael Niedermayer
2dbee1a393 avformat/mp3enc: Squeeze our mp3 encoder tag into the 9byte shortname instead of randomly truncating 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 16:15:25 +02:00
Michael Niedermayer
e744e9a305 Merge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9' 
* commit 'ef363ebd596da18f889a7d4845023a23dfac84c9':
  mp3enc: write full LAME frame

Conflicts:
	libavformat/mp3enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 15:30:12 +02:00
Michael Niedermayer
6ef5e29220 Merge commit '88b32673db39440422a73ec3047d3326c96b4fb2' 
* commit '88b32673db39440422a73ec3047d3326c96b4fb2':
  avconv: copy stream-level side data when streamcopying

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 13:14:33 +02:00
Michael Niedermayer
7ad34f4456 Merge commit 'c63418e0a3afbcdbc59fd65c270d45efafe092ce' 
* commit 'c63418e0a3afbcdbc59fd65c270d45efafe092ce':
  doc: reword the mp3 muxer documentation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 12:59:27 +02:00
Michael Niedermayer
899d3706d8 Merge commit '99143140dea12363af680d02e23cb42cfe191679' 
* commit '99143140dea12363af680d02e23cb42cfe191679':
  mp3dec: fix reading the Xing tag

Conflicts:
	libavformat/mp3dec.c

See: 19ff479f69
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 12:49:53 +02:00
Michael Niedermayer
2c5ae57776 Merge commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea' 
* commit '6df9d9b55d3f56ee7782639a7678eeeaf77f14ea':
  lavf: Use av_gettime_relative

Conflicts:
	libavformat/hls.c

See: f78bc96b7c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 12:40:36 +02:00
Michael Niedermayer
2896b98183 Merge commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f' 
* commit 'd0c093021943e9b9c23528b12cd61ca2a5b01b4f':
  avconv: Use av_gettime_relative

Conflicts:
	ffmpeg.c

See: 76191c08f8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 12:30:55 +02:00
Michael Niedermayer
872e087305 Merge commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72' 
* commit '248d8fb60c59c8e044d9c8f78f23383b7cdecf72':
  avplay: Use av_gettime_relative

Conflicts:
	ffplay.c

See: 0ca0b4c29c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 12:19:35 +02:00
Michael Niedermayer
63001833c5 Merge commit 'e205429fcf9de3182bce2f4cfd1d6401596a8666' 
* commit 'e205429fcf9de3182bce2f4cfd1d6401596a8666':
  tools: Use av_gettime_relative

See: 41120e6e40
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 11:57:33 +02:00
Michael Niedermayer
8fd07fa6cc Merge commit '6fdf35fe35d8c1c467708238100648a7a47c930d' 
* commit '6fdf35fe35d8c1c467708238100648a7a47c930d':
  lavc: Use av_gettime_relative

See: b052bccbe4
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 11:41:34 +02:00
Michael Niedermayer
e96ca404ea Merge commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5' 
* commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5':
  lavu: Add av_gettime_relative

Conflicts:
	libavutil/time.c
	libavutil/time.h
	libavutil/version.h

See: 0eec06ed87
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-10-24 11:06:56 +02:00
Anton Khirnov
ef363ebd59 mp3enc: write full LAME frame 
Most importantly, it contains the encoder delay and replaygain info.
 2014-10-24 09:03:16 +02:00
Anton Khirnov
88b32673db avconv: copy stream-level side data when streamcopying 2014-10-24 09:03:16 +02:00
Anton Khirnov
c63418e0a3 doc: reword the mp3 muxer documentation 
Make it more structured.
 2014-10-24 09:03:16 +02:00
Anton Khirnov
99143140de mp3dec: fix reading the Xing tag 
The quality scale field is only supposed to be present if the fourth bit
is set. In practice, lame always sets it, but other tools might not.

CC:libav-stable@libav.org
 2014-10-24 09:03:16 +02:00