RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
47,906 Commits 36 Branches 398 Tags 232 MiB
Commit Graph

47906 Commits

Author SHA1 Message Date
Clément Bœsch 7fb49639e6 lavu: make sure av_pix_fmt_desc_next returns a valid pix fmt. 
This is required because there are some "holes" in the list for
compatibility with the fork.

The commit also removes the now unecessary check from cmdutils.

Found-by: wm4
 2012-12-16 20:39:39 +01:00
Piotr Bandurski cb8163d0bd bfi: set duration 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 16:53:01 +01:00
Michael Niedermayer de89dff8da brstm: ask for samples for version != 1.0 
This also avoids 2 unused variable warnings.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 15:05:31 +01:00
Michael Niedermayer 633ae5a210 mjpegenc: fix 444 block count so it is below 10 
Fixes Ticket1990

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 15:05:31 +01:00
Paul B Mahol 5be38f9421 brstm: add missing new line to request for sample messages 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-16 13:04:17 +00:00
Michael Niedermayer 5b09c3407e doc/filters: fix "Dolby Pro Logic II" option name 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 13:24:59 +01:00
Michael Niedermayer efb4f96a7a Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: fix memleak on error during SPS parsing

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 13:21:42 +01:00
Stefano Sabatini 94877aad57 lavfi/crop: free x and y parsed expression objects 
Fix leak introduced in 1e5492ffe6.
 2012-12-16 13:16:47 +01:00
Michael Niedermayer dde4832b64 Merge commit '27c8337e595a058347150269d5c2c48281e4285b' 
* commit '27c8337e595a058347150269d5c2c48281e4285b':
  h264-mt: handle NAL_DPAs before calling ff_thread_finish_setup
  lavr: move AudioMix struct definition to audio_mix.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 13:09:30 +01:00
Paul B Mahol 1081d78746 build: fix idf demuxer dependency 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-16 12:00:23 +00:00
Paul B Mahol f4fe4fa89f Remove 8SVX_RAW on next lavc mayor bump 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-12-16 11:40:26 +00:00
Piotr Bandurski 5648069270 aiff: support in24/in32 tags 
Supported by QuickTime, libaudiofile and Csound.
 2012-12-16 10:41:00 +00:00
James Almer 7959c26fb0 brstm: fix number of samples for the last block 
Signed-off-by: James Almer <jamrial@gmail.com>
 2012-12-16 10:34:33 +00:00
Piotr Bandurski d0bdcbcb28 thp: set duration 2012-12-16 10:27:54 +00:00
Stefano Sabatini 013b700771 ffplay: provide some feedback in case the codec cannot be set 2012-12-16 10:58:02 +01:00
Stefano Sabatini 1cbb11cda7 ffplay: set codec_id in codec context 
Set codec id in case another codec is forced on the context (e.g. when
the user specify the codec with -codec).

For example fix:
ffplay -vcodec pgmyuv -i "tests/vsynth1/%02d.pgm"
 2012-12-16 10:58:02 +01:00
Stefano Sabatini cb0f97b59d ffplay: improve robustness of opt_codec(), and add options acodec,vcodec,scodec 
Fail with a meaningfull error message in case of bogus input.

Also the new options are more consistent with the rest of the tool
options, since it does not support generic stream specifiers.
 2012-12-16 10:57:50 +01:00
Michael Niedermayer 718eab527b ffmpeg: Improve filter input fps selection heuristic. 
This fixes a broken file that has a incorrect timebase at the codec level.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 05:21:29 +01:00
Michael Niedermayer 1e901ffc61 wrap_timestamp: remove unneeded check 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 01:07:53 +01:00
Michael Niedermayer 1662bd350a lavf: fix integer overflows 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 01:05:36 +01:00
Michael Niedermayer d7599bd8e2 h264: dont mess with frame gaps on second fields. 
Fixes assertion failure

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-16 00:28:36 +01:00
Peter Ross c16f768d73 ffmpeg: replace magic number with VSYNC_CFR 2012-12-16 09:48:54 +11:00
Harald Axmann 2d74dea84f lavf: Provide a monotonic timestamp to the outside world 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-15 21:28:45 +01:00
Piotr Bandurski 388241efa2 mpegvideo_enc/rv20: width and height must be multiple of 4 
RealPlayer does not play rv20 files when sizes are not multiple of 4

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-15 21:28:45 +01:00
Stefano Sabatini 0ebf85774b doc/filters: remove @example use for showing syntax 
I forgot to merge with the previous commit.
 2012-12-15 21:02:30 +01:00
Stefano Sabatini a871b5cc98 doc/filters: extend syntax description for transpose, and add examples 2012-12-15 20:56:14 +01:00
Stefano Sabatini 6722f35dd3 doc/filters: add basic crop examples 
Use it to show difference between shorthand and named parameters.
 2012-12-15 20:48:42 +01:00
Stefano Sabatini 55b81528a9 doc/filters: itemize crop examples 2012-12-15 20:48:36 +01:00
Stefano Sabatini 1e5492ffe6 lavfi/crop: add support to option parsing 
Also fix documentation accordingly.
 2012-12-15 20:48:20 +01:00
Janne Grunau a421bbfe83 h264: fix memleak on error during SPS parsing 
Introduced in d7d6efe42b.
 2012-12-15 19:16:39 +01:00
Janne Grunau 27c8337e59 h264-mt: handle NAL_DPAs before calling ff_thread_finish_setup 
Since a NAL_DPA can start a new frame it has to be handled before
ff_thread_finish_setup is called.
 2012-12-15 19:06:37 +01:00
Justin Ruggles 230acdde26 lavr: move AudioMix struct definition to audio_mix.c 2012-12-15 12:26:15 -05:00
Michael Niedermayer 2b643855e0 dirac_parser: check prev_pu_offset before using it 
Fixes out of array read

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-15 16:04:49 +01:00
Piotr Bandurski fef75ef200 mpegvideo_enc/rv10: width and hieghtmust be multiple of 16 
RealPlayer does not play correctly rv10 files when sizes are not multiple of 16

"RealVideo Encoder 1.0 supports any size image that is a multiple of sixteen pixels."

Reviewed-by: Nicolas George <nicolas.george@normalesup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-15 16:04:49 +01:00
rogerdpack fe3e0e486e lavd/dshow: rename dshow class name 
Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Stefano Sabatini <stefasab@gmail.com>
 2012-12-15 15:46:20 +01:00
Michael Niedermayer ac6cb666d9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  vp56: release frames on error

Conflicts:
	libavcodec/vp56.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-15 14:18:13 +01:00
Stefano Sabatini 54b0c04ae3 lavfi/overlay: clarify/fix comment, add a few empty lines to ease readability 2012-12-15 14:08:42 +01:00
Stefano Sabatini 3d1e2ada25 lavfi/overlay: remove duplicated definition of ff_null_get_video_buffer() 
Simplify.
 2012-12-15 13:51:24 +01:00
Stefano Sabatini 8f44170d30 lavfi/avfilter.h: clarify doxy for AVFilterLink.out_buf 2012-12-15 13:51:24 +01:00
Michael Niedermayer f186ecc164 Merge commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d' 
* commit 'bb675d3ac6d722d5e117ae9042a996b55ca05b1d':
  vp56: make parse_header return standard error codes

Conflicts:
	libavcodec/vp56.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-15 13:41:06 +01:00
Michael Niedermayer 75b7e543df fate: update fate for 1a490df12f 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-15 12:41:24 +01:00
Stefano Sabatini 33ab9ebd09 doc/APIchanges: fill empty git commit hashes and dates 2012-12-15 11:46:47 +01:00
Stefano Sabatini 1a490df12f ffprobe: show pkt_size in frame 
Fix trac ticket #2027.
 2012-12-15 11:46:47 +01:00
Stefano Sabatini 96d815fc0c lavc: add pkt_size field to AVFrame 2012-12-15 11:46:30 +01:00
Jean First a8b3f0c5cf fate: check if rsync has the contimeout option 
rsync on osx misses the --contimeout option

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-15 01:33:19 +01:00
Michael Niedermayer b6671787db flashsv2_prime: check block before using it. 
Fixes null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-15 00:19:52 +01:00
Michael Niedermayer 02d6d05339 dcadec: check xch_base_channel against channel_order_tab. 
Fix null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-14 23:37:44 +01:00
Michael Niedermayer 51fcf276f8 mp3on4: fix null pointer dereference 
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-14 21:50:43 +01:00
Michael Niedermayer a99c273a3f dnxhddec: fix CID changed check. 
Fixes Null pointer dereference

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-14 20:58:01 +01:00
Michael Niedermayer e095c4ea6d fate: update asyncts reference 
We cannot update the existing file because this would break
ffmpeg 1.0, which uses it

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-12-14 19:02:39 +01:00