virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity
47,190 Commits 37 Branches 400 Tags 467 MiB
e67fdbffe5
Commit Graph

47190 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anton Khirnov
e67fdbffe5 vf_fieldorder: switch to filter_frame, this filter did not support real slices 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 19:23:32 +01:00
Michael Niedermayer
59907340e1 libavfilter/fifo: fix indent 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 19:18:24 +01:00
Michael Niedermayer
b5572ab861 vf_boxblur: cosmetics to reduce diff to qatar 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 19:18:24 +01:00
Michael Niedermayer
7bfa2f25c0 vf_drawtext: switch to filter_frame, this filter did not support slices 
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 18:07:51 +01:00
Michael Niedermayer
384641468b vf_delogo: switch to filter_frame, this filter did not support slices 
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 18:07:33 +01:00
Michael Niedermayer
ed547e2ce5 vf_hqdn3d: fix permissions 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 18:05:09 +01:00
Michael Niedermayer
46a4e72bc5 vf_delogo: fix order of operations in apply_delogo() 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 18:03:03 +01:00
Anton Khirnov
250b122e3a vf_boxblur: switch to filter_frame, boxblur did not support slices 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 17:33:42 +01:00
Anton Khirnov
05945c7f88 libavfilter/fifo: switch to filter_frame, the filter did not support slices. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 17:33:42 +01:00
Paul B Mahol
6549a9b753 pgssubdec: remove unused variable 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-28 16:21:25 +00:00
Paul B Mahol
01eed8c607 iff demuxer: 16SV support 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-28 15:55:14 +00:00
Anton Khirnov
1b43fc127c vf_hqdn3d: switch to filter_frame 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 16:43:34 +01:00
Michael Niedermayer
8227a0b7df libavfilter: update doxy for filter_frame 
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 16:43:34 +01:00
Michael Niedermayer
3ed483cdfa libavfilter: Support using filter_frame for video 
With this we can mix filters using filter_frame OR start/draw_slice/end

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 16:43:34 +01:00
Michael Niedermayer
a0b8eec719 default_filter_frame: fix argument name 
Based on code by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 16:43:34 +01:00
Michael Niedermayer
f6dd145533 avfilter: check that filter_frame and slice variants are not both used 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 16:43:34 +01:00
Michael Niedermayer
cd7febd33f lavfi: replace filter_samples by filter_frame 
Based on patch by Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 16:43:34 +01:00
Reimar Döffinger
16af29a7a6 vc1dec: add hacks to ensure static tables are initialized in open(). 
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-11-28 16:41:48 +01:00
Reimar Döffinger
92947c6d72 Use err_out label for error-case cleanup. 
Will simplify future changes (introducing proper
locking around opening/closing parsers).

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-11-28 16:41:48 +01:00
Reimar Döffinger
8aa29f063c atrac3: do not use init_static_data to init VLC data. 
It would be called while registering the codec, which means
it needlessly wastes memory when it is never used.
Instead do the work when first opening the codec.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
 2012-11-28 16:41:48 +01:00
Paul B Mahol
23101ceaa2 avrdec: implement seeking 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-28 13:03:48 +00:00
Michael Niedermayer
42d3fea65f Merge commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1' 
* commit 'af7d13ee4a4bf8d708f9b0598abb8f6e22b76de1':
  asink_nullsink: plug a memory leak.
  x86: h264_idct: port to cpuflags
  x86: cpu: Drop unused HAVE_RWEFLAGS condition

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 13:32:17 +01:00
Michael Niedermayer
264441715b Merge commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563' 
* commit 'f5fa03660db16f9d78abc5a626438b4d0b54f563':
  vble: Do not abort decoding when version is not 1
  lavr: do not pass consumed samples as a parameter to ff_audio_resample()
  lavr: correct the documentation for the ff_audio_resample() return value
  lavr: do not pass sample count as a parameter to ff_audio_convert()
  x86: h264_weight: port to cpuflags
  configure: Enable avconv filter dependencies automatically

Conflicts:
	configure
	libavcodec/x86/h264_weight.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 13:27:18 +01:00
Paul B Mahol
b0d9b011c7 avrdec: sample rate takes 3 bytes not 4 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-28 11:02:22 +00:00
Paul B Mahol
1793128cf7 avrdec: fix typo in .long_name 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-28 10:56:59 +00:00
Anton Khirnov
af7d13ee4a asink_nullsink: plug a memory leak. 2012-11-28 08:43:54 +01:00
Michael Niedermayer
2c923983b6 qpeg: reset palette on seeks 
Fixes Ticket1921

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 05:16:15 +01:00
Michael Niedermayer
2754dbb6e1 nut: put nut PCM audio tags in front of avi tags. 
This fixes correctly storing and identifying PCM in nut.

Based on patch by Luca Barbato
Found-by: durandal_1707
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-28 02:03:56 +01:00
Diego Biurrun
2e89aeed65 x86: h264_idct: port to cpuflags 2012-11-28 00:28:09 +01:00
Diego Biurrun
490df522c7 x86: cpu: Drop unused HAVE_RWEFLAGS condition 
The test for rweflags was dropped in a previous commit.
 2012-11-28 00:28:09 +01:00
Stefano Sabatini
3a227f5d90 doc: add ffmpeg-protocols.texi manual 2012-11-27 23:35:45 +01:00
Stefano Sabatini
9c492271a8 doc: move syntax and eval chapters from libavutil to ffmpeg-utils 
Move utilities description to a dedicated manual, consistent with what I
did with the rest of the documentation.
 2012-11-27 23:35:35 +01:00
Stefano Sabatini
d82331721e doc: add libavdevice.texi and ffmpeg-devices.texi files 2012-11-27 23:35:25 +01:00
Stefano Sabatini
8ddeae5ae7 doc: add libavformat.texi and ffmpeg-formats.texi files 2012-11-27 23:35:19 +01:00
Stefano Sabatini
2ac6a3d1bf lavfi/drawtext: add support to expansion of generic expressions 2012-11-27 23:27:50 +01:00
Piotr Bandurski
f5fa03660d vble: Do not abort decoding when version is not 1 
Some combinations of OS, VirtualDub, and VBLE can accidentally
set the version to a value other than 1. Since no other version
of VBLE was ever released, simply warn about it.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2012-11-27 17:16:04 -05:00
Justin Ruggles
1d86aa8b0f lavr: do not pass consumed samples as a parameter to ff_audio_resample() 
Since the resampler handles buffering of unconsumed samples internally, the
caller does not need this information.
 2012-11-27 16:49:19 -05:00
Justin Ruggles
d2f9f8e094 lavr: correct the documentation for the ff_audio_resample() return value 2012-11-27 16:49:18 -05:00
Justin Ruggles
7f534d11ed lavr: do not pass sample count as a parameter to ff_audio_convert() 
It will always be the number of samples in the input buffer, so just use that
directly instead of passing it as a separate parameter.
 2012-11-27 16:49:18 -05:00
Diego Biurrun
28e1cf19aa x86: h264_weight: port to cpuflags 2012-11-27 21:10:38 +01:00
Michael Niedermayer
2cfa6fd025 mjpegdec: dont set got_picture to 0 per frame. 
Fixes Ticket1915

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 20:16:49 +01:00
Michael Niedermayer
541efe4120 mjpegdec: reset got_picture on errors, successful return, init and flush. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 20:16:49 +01:00
Michael Niedermayer
1c16483cc0 mjpegdec: replace returns by goto fail in frame decode. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 20:16:49 +01:00
Michael Niedermayer
de9fc0e9d6 mjpegdec: make sure ret is set before its used. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 20:16:49 +01:00
Paul B Mahol
761aba6811 fate: add ADPCM IMA Dialogic OKI decoder test 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2012-11-27 19:07:18 +00:00
Michael Niedermayer
93b89868e1 h264: support invalid annex B in mp4 
Fixes Ticket1914

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 18:06:00 +01:00
Martin Storsjö
54fd593a0e configure: Enable avconv filter dependencies automatically 
This makes sure minimal configurations such as
"--disable-everything --enable-avconv" will enable the filters
necessary for running avconv, instead of just keeping avconv
disabled (even if the user specified "--enable-avconv").

Signed-off-by: Martin Storsjö <martin@martin.st>
 2012-11-27 17:05:01 +02:00
Michael Niedermayer
c2c1726847 ffserver remove CONFIG_NOCUTILS check 
Nothing sets CONFIG_NOCUTILS, i also dont remember anything setting it in
the past.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 14:41:41 +01:00
Michael Niedermayer
4063bb212e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  h264: set Picture.owner2 to the current thread

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 14:36:53 +01:00
Michael Niedermayer
577b39aea2 Merge commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8' 
* commit '6e5cdf26281945ddea3aaf5eca4d127791f23ca8':
  h264: check ref_count validity for num_ref_idx_active_override_flag
  h264: add missing new line to log message
  dcadec: skip QMF on unused channels
  wavenc: write fact chunk sample count at the correct file position
  riff: do not add empty metadata tags in INFO chunk

Conflicts:
	libavcodec/dcadec.c
	libavcodec/h264.c
	libavformat/riff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2012-11-27 14:31:04 +01:00