RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
79,364 Commits 36 Branches 392 Tags 306 MiB
Commit Graph

79364 Commits

Author SHA1 Message Date
Derek Buitenhuis e8373143e1 ffprobe: Don't try and decode things that have no dec_ctx 
The last instance of a missing dec_ctx check from the merge.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-12 17:24:07 +01:00
Derek Buitenhuis 9cb1ed5735 ffprobe: Fix missing dec_ctx check 
Missed it during the merge of ffprobe codecpar conversion.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-12 16:50:01 +01:00
Derek Buitenhuis aa9517583e Merge commit '4d13bcceb9a1820f8e9b2c89e00816d3db41b716' 
This commit is a no-op.

* commit '4d13bcceb9a1820f8e9b2c89e00816d3db41b716':
  sdp: fix opus sprop-stereo fmtp syntax

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-12 15:59:41 +01:00
Derek Buitenhuis 05e4783c29 Merge commit 'f6ccee9bed92c09799777c1dfb2b2772763e0e83' 
* commit 'f6ccee9bed92c09799777c1dfb2b2772763e0e83':
  fate: fft: Split DCT/FFT/MDCT/RDFT tests into separate targets

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-12 15:58:15 +01:00
Derek Buitenhuis 2605967f7e Merge commit '4c297249ac0f513a610a62691ce96d6b62f65b94' 
* commit '4c297249ac0f513a610a62691ce96d6b62f65b94':
  rdft: arm: Split RDFT initialization into a separate file

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-12 15:43:34 +01:00
Derek Buitenhuis 197fa698c6 Merge commit '97aec6e75ef36ed0402653519daa8e1fc8ddb555' 
* commit '97aec6e75ef36ed0402653519daa8e1fc8ddb555':
  fft: arm: Drop unnecessary #include, add missing ones

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-12 15:43:09 +01:00
Derek Buitenhuis d496d52d02 Merge commit '73ff983e8dd22ccee166403d0bbbc9c1cd543622' 
* commit '73ff983e8dd22ccee166403d0bbbc9c1cd543622':
  fft: x86: cosmetics: Drop silly comments, add comment, whitespace

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-12 15:42:21 +01:00
Derek Buitenhuis 6e2ca81485 Merge commit 'ce9d7da7650473f580dcce8c9f8550ea532aa6bd' 
* commit 'ce9d7da7650473f580dcce8c9f8550ea532aa6bd':
  qsv: Move down the implementation query

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-12 15:41:46 +01:00
Derek Buitenhuis 9a98ddcf1b Merge commit 'dbb43b8b83b097585ec255ec638b61e359ebea77' 
* commit 'dbb43b8b83b097585ec255ec638b61e359ebea77':
  avpacket: properly reset data/size in av_packet_move_ref()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-12 15:39:10 +01:00
Derek Buitenhuis 9080dc7f07 Merge commit 'ba357e98691ee4fe1a503b8830c0050be4127475' 
* commit 'ba357e98691ee4fe1a503b8830c0050be4127475':
  avprobe: switch to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-12 15:38:03 +01:00
Paul B Mahol 9149e9c0ba avcodec/apedec: fix decoding of stereo files with one channel full of silence 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-12 11:03:48 +02:00
Michael Niedermayer 196cfc278d avformat/utils: use av_codec_g/set_lowres() 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-12 04:21:12 +02:00
Timo Rothenpieler 901b0f1a21 avformat/concatdec: Use correct stream count on close 2016-04-11 21:06:10 +02:00
Lou Logan 03d8fee912 doc/filters: document testsrc2 source filter 
Signed-off-by: Lou Logan <lou@lrcd.com>
 2016-04-11 10:26:25 -08:00
Matthieu Bouron 4c22441276 swscale/arm: add yuv2planeX_8_neon 2016-04-11 18:13:36 +02:00
Michael Niedermayer 0c79c96cf2 doc/examples/muxing: Add support to pass flags to muxer as since codecpar the codec flags are not available to the muxer anymore 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-11 17:57:06 +02:00
Derek Buitenhuis 48fb5294d0 Merge commit '567d6d5f9d1400f00445183b3477391f58979aa3' 
* commit '567d6d5f9d1400f00445183b3477391f58979aa3':
  avprobe: add local per-stream state

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 16:46:30 +01:00
Derek Buitenhuis 9d48aa6d7d Merge commit 'c9478410c68c04261f9cfcd80474607e50bd1852' 
* commit 'c9478410c68c04261f9cfcd80474607e50bd1852':
  avprobe: add local per-file state

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 16:33:13 +01:00
Derek Buitenhuis 95348174ef Merge commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b' 
* commit 'c80344d0101558098a6cd2ed5082ff5fda7ca18b':
  mpegvideo_enc: use avcodec_free_context() instead of av_free()

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 16:02:16 +01:00
Derek Buitenhuis 6614214ece Merge commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7' 
* commit '168a443d43b10ef6a3545d64b2f8bc90144ce4b7':
  avprobe: print information from the codec descriptor

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 16:01:22 +01:00
Derek Buitenhuis 80195236c8 Merge commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd' 
* commit 'e7188a1a84817b8d4337340c21c552ad0b6cb2fd':
  avprobe: remove a pointless condition and a dead branch

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 15:30:55 +01:00
Clément Bœsch c921f4f687 sws/aarch64: add ff_yuv2planeX_8_neon 2016-04-11 16:27:19 +02:00
Derek Buitenhuis 0dfbca73bb Merge commit 'dc4983d78af2a666461654067d2e5d45b835358a' 
This commit is a no-op.

* commit 'dc4983d78af2a666461654067d2e5d45b835358a':
  APIchanges: add missing hashes and dates

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 15:10:02 +01:00
Derek Buitenhuis 6586f62d1a Merge commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc' 
* commit '3e8fd93b6ab219221e17fa2b6243cc72cf2d69dc':
  lavf: add a missing bump and APIchanges for the codecpar switch

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 15:09:00 +01:00
Derek Buitenhuis 3dec7ed3cf Merge commit 'e66fa35392cd45d0a80774cd057fb765d60def43' 
* commit 'e66fa35392cd45d0a80774cd057fb765d60def43':
  vc1dec: Check group allocations separatedly

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 15:06:18 +01:00
Derek Buitenhuis 8cd1323103 Merge commit '01f0e6a0c9270f1d5bef08459a6f167cf55e0596' 
This commit is a no-op. We already did this.

* commit '01f0e6a0c9270f1d5bef08459a6f167cf55e0596':
  vc1dec: Fix leak on error for array allocations

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 15:03:14 +01:00
Derek Buitenhuis 015ca20030 Merge commit 'f91d94bdfc3f5f83ff0be4d19d10d0a35697386f' 
* commit 'f91d94bdfc3f5f83ff0be4d19d10d0a35697386f':
  vc1dec: Properly call deinit function on error

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 15:01:43 +01:00
Derek Buitenhuis e06f5c6f94 Merge commit '35b1cd343cd703c1b0fc926dc43a92141a357380' 
* commit '35b1cd343cd703c1b0fc926dc43a92141a357380':
  vc1dec: Drop commented out cruft

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 15:00:53 +01:00
Derek Buitenhuis 8a1c79024d Merge commit 'fa55addd23c2f168163175aee17adb125c2c0710' 
* commit 'fa55addd23c2f168163175aee17adb125c2c0710':
  img2: Drop av_ prefix for a static function

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 14:59:58 +01:00
Derek Buitenhuis 8a6cc30b04 Merge commit 'd6e49096c0c3c10ffb176761b0da150c93bedbf6' 
This commit is a no-op.

* commit 'd6e49096c0c3c10ffb176761b0da150c93bedbf6':
  idct: Only build prores IDCT if ProRes decoder is enabled

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 14:58:39 +01:00
Derek Buitenhuis d30cf57a7b Merge commit '3c53627ac17fc6bdea5029be57da1e03b32d265d' 
* commit '3c53627ac17fc6bdea5029be57da1e03b32d265d':
  qsvdec: store the sync point in heap memory

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 14:56:27 +01:00
Derek Buitenhuis acc155ac55 Merge commit 'a1335149fd610b16459d9281b611282cac51c950' 
* commit 'a1335149fd610b16459d9281b611282cac51c950':
  qsvenc: store the sync point in heap memory

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 14:45:57 +01:00
Derek Buitenhuis 8cae006c56 Merge commit '1138eb5509d3db7f6d565cb45f137a786d22beb9' 
* commit '1138eb5509d3db7f6d565cb45f137a786d22beb9':
  vsrc_movie: convert to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 14:42:30 +01:00
Derek Buitenhuis 6bc5ef37cb Merge commit 'ac6d53589f3631ae08467c784fb371a15c957f01' 
* commit 'ac6d53589f3631ae08467c784fb371a15c957f01':
  examples/transcode_aac: convert to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 14:15:28 +01:00
Derek Buitenhuis 030e69b4dc Merge commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a' 
* commit 'a9e1f2cc61cbd5606a087a60565e87923c39de5a':
  examples/qsvdec: convert to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 14:07:41 +01:00
Derek Buitenhuis d76972b581 Merge commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7' 
* commit '9897d9f4e074cdc6c7f2409885ddefe300f18dc7':
  examples/output: convert to codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-11 14:06:43 +01:00
Paul B Mahol b62ed56e25 avcodec/shorten: properly handle bitshift > 31 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-11 13:14:55 +02:00
Michael Niedermayer 15fa01786c avformat/hdsenc: Pass flags to child context 
This is needed as the bitexact flag is not in the codecpar context, and thus not copied

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-11 04:34:00 +02:00
Michael Niedermayer 0c9ad94e97 avformat/dashenc: Pass flags to child context 
This is needed as the bitexact flag is not in the codecpar context, and thus not copied

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-11 04:34:00 +02:00
Michael Niedermayer 4104f18358 avformat/segment: Pass flags to child context 
This is needed as the bitexact flag is not in the codecpar context, and thus not copied

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-11 04:34:00 +02:00
Michael Niedermayer 02d08da81f avdevice/caca: switch to codecpar 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
 2016-04-11 01:34:02 +02:00
James Almer 5501f58e52 fate: fix sample dependencies for fate-{a,v}filter tests 2016-04-10 18:31:05 -03:00
Derek Buitenhuis 972df59f4f Merge commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70' 
This commit is a no-op. We want to do this ourselves since avplay and
ffplay differ quite a bit.

* commit 'c23152a90371bfe971b063781ef4e7d9d5ef9d70':
  avplay: convert do codecpar

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-10 21:49:56 +01:00
Derek Buitenhuis bc91bc1d8b Merge commit '0705f5960c9d272cef1309c090000865b991c9c7' 
This commit is a no-op. We did this already in 9e0d1c00b5.

* commit '0705f5960c9d272cef1309c090000865b991c9c7':
  avplay: do not use AVStream.codec for decoding

Merged-by: Derek Buitenhuis <derek.butienhuis@gmail.com>
 2016-04-10 21:49:00 +01:00
Derek Buitenhuis bbf5ef9dac Merge commit '15e84ed3f141c586e8cb78ed58365cf5a511108a' 
This commit is a no-op. We want to do this ourselves, since avconv and ffmpeg
differ quite a bit.

* commit '15e84ed3f141c586e8cb78ed58365cf5a511108a':
  avconv: convert to codecpar

Merged-by: Derek Buitenhuis <derek.butienhuis@gmail.com>
 2016-04-10 21:47:26 +01:00
Derek Buitenhuis 6372c9dc99 Merge commit '5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d' 
This commit is a no-op. We already moved it here.

* commit '5b9cdf8cba114c41239bf0f9f5e0ccb6977d1c8d':
  avconv: switch opening decoders and encoders

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-10 21:29:30 +01:00
Derek Buitenhuis 6f69f7a8bf Merge commit '9200514ad8717c63f82101dc394f4378854325bf' 
* commit '9200514ad8717c63f82101dc394f4378854325bf':
  lavf: replace AVStream.codec with AVStream.codecpar

This has been a HUGE effort from:
    - Derek Buitenhuis <derek.buitenhuis@gmail.com>
    - Hendrik Leppkes <h.leppkes@gmail.com>
    - wm4 <nfxjfg@googlemail.com>
    - Clément Bœsch <clement@stupeflix.com>
    - James Almer <jamrial@gmail.com>
    - Michael Niedermayer <michael@niedermayer.cc>
    - Rostislav Pehlivanov <atomnuker@gmail.com>

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
 2016-04-10 20:59:55 +01:00
Jakub Stachowski 60b75186b2 avcodec/wmalosslessdec: do not discard last frame 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-10 21:33:56 +02:00
Paul B Mahol 571aa7d25e avcodec/shorten: mark as AV_CODEC_CAP_SUBFRAMES 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
 2016-04-10 19:54:43 +02:00
Martin Vignali b45d542ea6 fate/exr : add test for PXR24 Float and tile uncompress 2016-04-10 19:47:51 +02:00