virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-12 19:18:44 +02:00
Code Issues Releases Activity
48,641 Commits 37 Branches 400 Tags 463 MiB
252316c885
Commit Graph

12105 Commits

Author SHA1 Message Date
Michael Niedermayer
252316c885 img2dec: fix -loop 
This fixes a infinite loop with -loop and -vframes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 20:07:16 +01:00
Paul B Mahol
626756aed2 img2dec: do not change packet pts for image2pipe 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-08 16:51:18 +00:00
Paul B Mahol
55d32eed8f img2dec: seeking support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-08 14:29:22 +00:00
Michael Niedermayer
315f15afe7 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  rtsp: Respect max_delay for the reordering queue when using custom IO

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 13:14:39 +01:00
Michael Niedermayer
48d30f6733 Merge commit '8729698d50739524665090e083d1bfdf28235724' 
* commit '8729698d50739524665090e083d1bfdf28235724':
  rtsp: Recheck the reordering queue if getting a new packet
  lavr: log channel conversion description for any-to-any functions
  lavr: mix: reduce the mixing matrix when possible
  lavr: cosmetics: reindent

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 13:05:13 +01:00
Michael Niedermayer
3bca69c2a8 Merge commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3' 
* commit '9a00374cb4512a58a1fee366b850dfa87c76e1f3':
  doc: Fix a few typos in the developer documentation
  xwma: Remove unused variable
  asfdec: Fix printf format string length modifier

Conflicts:
	doc/developer.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 12:34:14 +01:00
Martin Storsjö
f811cd2d47 rtsp: Respect max_delay for the reordering queue when using custom IO 
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-08 11:22:43 +02:00
Martin Storsjö
8729698d50 rtsp: Recheck the reordering queue if getting a new packet 
If we timed out and consumed a packet from the reordering queue,
but didn't return a packet to the caller, recheck the queue status.
Otherwise, we could end up in an infinite loop, trying to consume
a queued packet that has already been consumed.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
 2013-01-08 11:22:37 +02:00
Michael Niedermayer
1a088f61e1 oggparseskeleton: Check the overall start time before using it. 
Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 02:58:01 +01:00
Michael Niedermayer
953061ed95 lavf/utils: more complete dts checks 
Fixes division by zero

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-08 00:28:35 +01:00
Michael Niedermayer
0780fe2740 rmdec: Limit videobufsize to remaining amount of data 
Fixes excessive memory allocation

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 21:35:52 +01:00
Peter Ross
a572cc8c7a wtvdec: prevent memory leak in get_tag() 2013-01-08 01:59:13 +11:00
Michael Niedermayer
7a6beedd3f oggparsevorbis: fix vorbis_cleanup return type 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 14:20:28 +01:00
Michael Niedermayer
1700be5855 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  oggdec: make sure the private parse data is cleaned up

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 14:20:21 +01:00
Michael Niedermayer
2db8660f09 Merge commit '89b51b570daa80e6e3790fcd449fe61fc5574e07' 
* commit '89b51b570daa80e6e3790fcd449fe61fc5574e07':
  oggdec: free the ogg streams on read_header failure

Conflicts:
	libavformat/oggdec.c

Original commit this was based on: (this merge just moves the function up)
commit 07a866282f
Author: Michael Niedermayer <michaelni@gmx.at>
Date:   Tue Nov 20 15:12:37 2012 +0100

    oggdec: fix memleak on header parsing failure

    Fixes Ticket1931

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-07 14:03:48 +01:00
Benjamin Larsson
bbae68596e xwma: Remove unused variable 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2013-01-07 13:25:20 +01:00
Peter Ross
8b4842c2e2 wtvdec: warn about truncated files 2013-01-07 23:14:58 +11:00
Peter Ross
801b636633 wtvenc: mux thumbnail picture 2013-01-07 23:14:58 +11:00
Peter Ross
361ecb6176 wtvdec: ignore WM/MediaThumbType metadata entry 
This tag is used by Windows Media Centre in displaying the thumbnail,
and should be transformed into FFmpeg metadata string.
 2013-01-07 23:14:58 +11:00
Peter Ross
508836932f wtvdec: demux thumbnail picture to AVStream.attached_pic 2013-01-07 23:14:58 +11:00
Paul B Mahol
2a89081cad Add EVRCA and SMV codec id 
Demuxing files should be possible even if there are
no decoding support in lavc (yet).

Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-07 11:43:20 +00:00
Peter Ross
6cff56f0ba frmdec: tag 2 is AV_PIX_FMT_RGB0 2013-01-07 22:06:06 +11:00
Peter Ross
8d4c817c4a frmdec: terminate frm_pix_fmt_tags 2013-01-07 22:06:06 +11:00
Peter Ross
f2dc158b0a frmdec: use AV_PIX_FMT_xxx 2013-01-07 22:06:06 +11:00
Paul B Mahol
7f7f31bfcb iff: support seeking with maud 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-07 10:19:49 +00:00
Paul B Mahol
3174137d41 w64: fact guid support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-07 10:08:38 +00:00
Diego Biurrun
e817d9139f asfdec: Fix printf format string length modifier 2013-01-07 09:21:42 +01:00
Michael Niedermayer
2713e43ac8 ff_get_audio_frame_size: try to fix wma in wav 
Fixes Ticket1905, Ticket2114

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 19:46:04 +01:00
Carl Eugen Hoyos
1ae9d2820e Support decoding AC-3 in wav. 
All known samples are actually ac3-in-spdif-in-wav, so use
the spdif demuxer to get the ac3 frames.
 2013-01-06 18:48:51 +01:00
Luca Barbato
d894f74762 oggdec: make sure the private parse data is cleaned up 2013-01-06 17:59:54 +01:00
Luca Barbato
89b51b570d oggdec: free the ogg streams on read_header failure 
Plug an annoying memory leak on broken files.
 2013-01-06 17:59:54 +01:00
Carl Eugen Hoyos
9ff92cf195 012v decoder. 
The decoder also supports a12v, but removes the transparency layer
since no samples with actual transparency are available for testing.
 2013-01-06 17:59:27 +01:00
Carl Eugen Hoyos
9ffe790afc Support stereo as experimental feature in mmf / Yamaha SMAF. 
Fixes ticket #1085.
 2013-01-06 16:38:24 +01:00
Diego Biurrun
a0c5917f86 Drop Snow codec 
Snow is a toy codec with no real-world use and horrible code.
 2013-01-06 16:30:02 +01:00
Michael Niedermayer
8214c1d82c mxfenc: avoid depending on private codec structures and functions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-06 14:08:08 +01:00
Peter Ross
c44b4ee6ea frmdec: reduce probe score to reflect test accuracy (and pass probetest) 2013-01-06 16:51:57 +11:00
Peter Ross
3d0994be2f Megalux Frame demuxer 2013-01-06 13:58:15 +11:00
Carl Eugen Hoyos
1a34103f0f mmf.c: Use LIBAVFORMAT_IDENT when writing Yamaha SMAF version information. 2013-01-05 23:39:46 +01:00
内田佳久
7e5d4fa97d mmf.c: Do not write metadata into the SMAF Contents Info chunk. 2013-01-05 23:11:09 +01:00
James Almer
b7d77f8e64 astenc: Enable the loop flag only when needed 
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-05 17:07:42 +01:00
Paul B Mahol
14d50c19dc w64dec: support metadata (summarylist guid) 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-05 11:03:52 +00:00
Carl Eugen Hoyos
c52e07bb6e Fix AVCI50 SPS to specify a SAR of 4:3 instead of 3:4. 2013-01-05 09:20:03 +01:00
Xi Wang
3b81bba3bc mxfdec: fix NULL checking in mxf_get_sorted_table_segments() 
The following out-of-memory check is broken.

    *sorted_segments  = av_mallocz(...);
    if (!sorted_segments) { ... }

The correct NULL check should use *sorted_segments.

Signed-off-by: Xi Wang <xi.wang@gmail.com>
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2013-01-04 20:43:42 -05:00
Michael Niedermayer
fa11f36876 mpegpsenc: avoid shifting dts/pts 
Only shift if needed to avoid negative scr when requested
or for dvd.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-04 20:58:59 +01:00
Michael Niedermayer
cf369d4449 mpegpsenc: show first SCR/DTS at debug level 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-04 20:58:59 +01:00
Michael Niedermayer
9fd0cf8a3b mpegpsenc: move preload recalculation to where its needed 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-04 20:58:59 +01:00
Michael Niedermayer
2a23f6035e mpegpsenc: Fix SCR handling for DVD 
This makes the initial SCR equal 0

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-04 20:58:59 +01:00
Michael Niedermayer
84aba8eed9 mpegpsenc: restructure SCR handling 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2013-01-04 20:58:59 +01:00
Justin Ruggles
f2214c6224 au: use ff_raw_write_packet() 2013-01-04 19:52:57 +00:00
Paul B Mahol
d885cc41e5 Fix "knwon" typo and add a check in tools/patcheck 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2013-01-04 19:24:37 +00:00