ffmpeg.git
5 years agoavcodec/j2kenc: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/j2kenc: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8443b27072a076abb28d7f2f60bc90e1d5c285df)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libopenjpegenc: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/libopenjpegenc: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 1458f0647ca0c882cc1c29892ac130a1056a1f47)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/mjpegenc: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/mjpegenc: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5b3f4b3ef590b1221d44d24345a846c1aa636b69)

Conflicts:

libavcodec/mjpegenc.c

5 years agoavcodec/msvideo1enc: drop dependancy on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 15:27:36 +0000 (16:27 +0100)]
avcodec/msvideo1enc: drop dependancy on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c81234651f761a44a3e72829fd494211e237069c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/diracdec: avoid depending on sizeof(AVFrame)
Michael Niedermayer [Tue, 17 Dec 2013 14:30:20 +0000 (15:30 +0100)]
avcodec/diracdec: avoid depending on sizeof(AVFrame)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fca7943850ecdc1e67a0275b488768be01867f75)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/utils: implement avcodec_alloc_frame() through av_alloc_frame()
Michael Niedermayer [Tue, 17 Dec 2013 13:03:38 +0000 (14:03 +0100)]
avcodec/utils: implement avcodec_alloc_frame() through av_alloc_frame()

This ensures that theres just one AVFrame allocation function and libs dont
produce multiple AVFrame variants after a minor lib update

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5abdda214df53f009434f19b9eb8e1375f2924d9)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libutvideodec: use av_frame_move_ref()
Michael Niedermayer [Mon, 9 Dec 2013 23:50:09 +0000 (00:50 +0100)]
avcodec/libutvideodec: use av_frame_move_ref()

AVFrames cannot be copied literally, their definition is in
avutil and their extended_data can point to their data[]

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4c1b4ae1baf77df7150fa8cbcece8057a261e47d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'
Michael Niedermayer [Mon, 9 Dec 2013 19:06:39 +0000 (20:06 +0100)]
Merge commit 'd4f1188d1a662fed5347e70016da49e01563e8a8'

* commit 'd4f1188d1a662fed5347e70016da49e01563e8a8':
  dv: use AVFrame API properly

Conflicts:
libavcodec/dvdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 94a849b8b6c3e4a90361485b2e12a9a5c35833a3)

Conflicts:

libavcodec/dv.h
libavcodec/dvdec.c
libavcodec/dvenc.c

Author of the merged code: Anton Khirnov

5 years agoMerge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'
Michael Niedermayer [Mon, 9 Dec 2013 12:19:50 +0000 (13:19 +0100)]
Merge commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac'

* commit 'd351ef47d0e0ccb7de96b37f137c16b2885580ac':
  pthread_frame: use the AVFrame API properly.

Conflicts:
libavcodec/pthread_frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 45fd4ec9ef2b3a7074c49cdddac6e7dcc127a874)

Conflicts:

libavcodec/pthread_frame.c
Author of the merged code: Anton Khirnov

5 years agoMerge commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c'
Michael Niedermayer [Mon, 9 Dec 2013 12:02:16 +0000 (13:02 +0100)]
Merge commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c'

* commit 'b605b123ef1d3bac0e7c221d8d7fa74cd8c7253c':
  mxpegdec: use the AVFrame API properly.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8947f47fdfaf7f3a907a334fc65dc724f2fdd23f)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'afa21a12bf084f905187615706b0a8d92bc98661'
Michael Niedermayer [Mon, 9 Dec 2013 11:54:59 +0000 (12:54 +0100)]
Merge commit 'afa21a12bf084f905187615706b0a8d92bc98661'

* commit 'afa21a12bf084f905187615706b0a8d92bc98661':
  p*menc: use the AVFrame API properly.

Conflicts:
libavcodec/Makefile
libavcodec/pamenc.c
libavcodec/pnmenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 37945584bfb29f187e38531c90bb02a32014e48d)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoAdd support for picture_ptr field in MJpegDecodeContext
anatoly [Sun, 27 Mar 2011 20:16:25 +0000 (22:16 +0200)]
Add support for picture_ptr field in MJpegDecodeContext

Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit e0e3b8b297bae5144f23fd4b46a1309857040b63)

Conflicts:

libavcodec/jpeglsdec.c
libavcodec/mjpegbdec.c
libavcodec/mjpegdec.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2fade10cb0c53e6b2a663d8ce0566ba7c61013cf)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'
Michael Niedermayer [Mon, 9 Dec 2013 11:32:37 +0000 (12:32 +0100)]
Merge commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5'

* commit 'e2274aa555f023e4f4e4819bf29b2d7e0adec7d5':
  mjpegdec: use the AVFrame API properly.

Conflicts:
libavcodec/mjpegdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 639303867640d1880fad675472bc47e9c95f96c7)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 17 Nov 2013 12:27:46 +0000 (13:27 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  mpegvideo_enc: use the AVFrame API properly.
  ffv1: use the AVFrame API properly.
  jpegls: use the AVFrame API properly.
  huffyuv: use the AVFrame API properly.

Conflicts:
libavcodec/ffv1.c
libavcodec/ffv1.h
libavcodec/ffv1dec.c
libavcodec/ffv1enc.c

Changes to ffv1 are more redone than merged due to them being based on
an ancient codebase and a good part of that having being done already
as well.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit be1e6e7503b2f10b0176201418eb97912cee093f)

Conflicts:

libavcodec/ffv1enc.c
libavcodec/mpegvideo.h
libavcodec/mpegvideo_enc.c
Author of the merged code: Anton Khirnov

5 years agoMerge commit 'd48c20630214a4effcc920e93a5044bee4e2002e'
Michael Niedermayer [Sun, 17 Nov 2013 02:31:32 +0000 (03:31 +0100)]
Merge commit 'd48c20630214a4effcc920e93a5044bee4e2002e'

* commit 'd48c20630214a4effcc920e93a5044bee4e2002e':
  qtrleenc: use the AVFrame API properly.
  ulti: use the AVFrame API properly.
  vc1: use the AVFrame API properly.
  flashsv: use the AVFrame API properly.

Conflicts:
libavcodec/flashsv.c
libavcodec/qtrleenc.c
libavcodec/ulti.c
libavcodec/vc1dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 92cbd775687204f9750a09c69f97702719036aab)

Conflicts:

libavcodec/flashsv.c
Author of the merged code: Anton Khirnov

5 years agoMerge commit 'ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa'
Michael Niedermayer [Sun, 17 Nov 2013 11:41:42 +0000 (12:41 +0100)]
Merge commit 'ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa'

* commit 'ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa':
  libxvid: use the AVFrame API properly.
  pcxenc: use the AVFrame API properly.
  roqvideo: remove unused variables
  libschroedingerenc: use the AVFrame API properly.

Conflicts:
libavcodec/pcxenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f4f7888bab7061f08c54356c285adaba24383dc0)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '97168b204a0b6b79bb6c5f0d40efdf7fc2262476'
Michael Niedermayer [Sun, 17 Nov 2013 11:33:27 +0000 (12:33 +0100)]
Merge commit '97168b204a0b6b79bb6c5f0d40efdf7fc2262476'

* commit '97168b204a0b6b79bb6c5f0d40efdf7fc2262476':
  eatgv: use the AVFrame API properly.
  libxavs: use the AVFrame API properly.
  nuv: use the AVFrame API properly.
  flashsvenc: use the AVFrame API properly.

Conflicts:
libavcodec/eatgv.c
libavcodec/nuv.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a0c0629dd963b00f989172f0c599353b6b288c37)

Conflicts:

libavcodec/eatgv.c
Author of the merged code: Anton Khirnov

5 years agoMerge commit '57e7b3a89f5a0879ad039e8f04273b48649799a8'
Michael Niedermayer [Sun, 17 Nov 2013 11:17:05 +0000 (12:17 +0100)]
Merge commit '57e7b3a89f5a0879ad039e8f04273b48649799a8'

* commit '57e7b3a89f5a0879ad039e8f04273b48649799a8':
  dnxhdenc: use the AVFrame API properly.
  libx264: use the AVFrame API properly.
  svq1enc: use the AVFrame API properly.
  gif: use the AVFrame API properly.

Conflicts:
libavcodec/gif.c
libavcodec/svq1enc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5b0c70c2499e20529d517b712910d6f4f72e9485)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7'
Michael Niedermayer [Sun, 17 Nov 2013 11:02:09 +0000 (12:02 +0100)]
Merge commit '45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7'

* commit '45bde93eefa78c1bdb0936109fbd2e2fb27fbfe7':
  sunrastenc: use the AVFrame API properly.
  targaenc: use the AVFrame API properly.
  tiffenc: use the AVFrame API properly.
  pngenc: use the AVFrame API properly.

Conflicts:
libavcodec/pngenc.c
libavcodec/sunrastenc.c
libavcodec/targaenc.c
libavcodec/tiffenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3ea168edeb7a20eae1fccf7da66ac7b8c8c791ba)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc'
Michael Niedermayer [Sun, 17 Nov 2013 10:41:26 +0000 (11:41 +0100)]
Merge commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc'

* commit '0ea430c75b8d90449d2878ad84669a2da2ad3cbc':
  lclenc: use the AVFrame API properly.

Conflicts:
libavcodec/lclenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 85b7b0c519f8d9491b4c0340329a605cc97c8984)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'e4155f15b35c4272a235f5521d2dc6c2aabdd462'
Michael Niedermayer [Sun, 17 Nov 2013 02:17:00 +0000 (03:17 +0100)]
Merge commit 'e4155f15b35c4272a235f5521d2dc6c2aabdd462'

* commit 'e4155f15b35c4272a235f5521d2dc6c2aabdd462':
  eamad: use the AVFrame API properly.
  dpxenc: use the AVFrame API properly.
  bmpenc: use the AVFrame API properly.
  sgienc: use the AVFrame API properly.

Conflicts:
libavcodec/bmpenc.c
libavcodec/dpxenc.c
libavcodec/eamad.c
libavcodec/sgienc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9ad477d9098b5281cede0bd8525ca90b0e52436d)

Conflicts:

libavcodec/eamad.c

Author of the merged code: Anton Khirnov

5 years agoMerge commit '730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7'
Michael Niedermayer [Sun, 17 Nov 2013 01:43:57 +0000 (02:43 +0100)]
Merge commit '730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7'

* commit '730bac7bab3c7dcd9fcb7c70f154e5f4cfaef9a7':
  mss4: use the AVFrame API properly.
  mss3: use the AVFrame API properly.
  mss2: use the AVFrame API properly.
  mss1: use the AVFrame API properly.

Conflicts:
libavcodec/mss1.c
libavcodec/mss2.c
libavcodec/mss3.c
libavcodec/mss4.c

See: 02fe531afefa7ac3fcc552f8e83461a4bfa7f868
See: ff1c13b133d548b3ce103f91999b6cc1bb7e65cc
See: 310bf283542ff81a9ec8fa7492fe7d625e80562f
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8d193a24f2da825aaf5382e4aa42ab533806b033)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '508b37557bf36eae83c18e64d42f27b44a321d81'
Michael Niedermayer [Sun, 17 Nov 2013 01:33:49 +0000 (02:33 +0100)]
Merge commit '508b37557bf36eae83c18e64d42f27b44a321d81'

* commit '508b37557bf36eae83c18e64d42f27b44a321d81':
  tiertexseqv: use the AVFrame API properly.
  smc: use the AVFrame API properly.
  truemotion2: use the AVFrame API properly.
  truemotion1: use the AVFrame API properly.

Conflicts:
libavcodec/smc.c
libavcodec/tiertexseqv.c
libavcodec/truemotion1.c
libavcodec/truemotion2.c

See: e999f2339ab0200039ee7123b75d79a52aaac5d1
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 72df87088c8a6593d66b207140edd32b4d2fb6ee)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '4a4841d4e0f0dc50998511bf6c48b518012024db'
Michael Niedermayer [Sun, 17 Nov 2013 01:24:27 +0000 (02:24 +0100)]
Merge commit '4a4841d4e0f0dc50998511bf6c48b518012024db'

* commit '4a4841d4e0f0dc50998511bf6c48b518012024db':
  fraps: use the AVFrame API properly.
  rpza: use the AVFrame API properly.
  motionpixels: use the AVFrame API properly.
  vmdvideo: use the AVFrame API properly.

Conflicts:
libavcodec/fraps.c
libavcodec/motionpixels.c
libavcodec/rpza.c
libavcodec/vmdav.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4362f272c0ae280cde833589e5c9c6696bd878d5)

Conflicts:

libavcodec/vmdav.c

Author of the merged code: Anton Khirnov

5 years agoMerge commit '3c8ea9d4a74fd4d7493d40c818ca64ee492709f3'
Michael Niedermayer [Sun, 17 Nov 2013 01:09:29 +0000 (02:09 +0100)]
Merge commit '3c8ea9d4a74fd4d7493d40c818ca64ee492709f3'

* commit '3c8ea9d4a74fd4d7493d40c818ca64ee492709f3':
  vmnc: use the AVFrame API properly.
  xan: use the AVFrame API properly.
  xxan: use the AVFrame API properly.
  zerocodec: use the AVFrame API properly.

Conflicts:
libavcodec/vmnc.c
libavcodec/xan.c
libavcodec/xxan.c

See: cf5ab8b6f71699a48a6384d5e5779630b4be7b56
See: ad438f450b83882a1277a79c1c3d6dfe55573b1c
See: 67607e20e882eb5639a4e9099caecb52a863ab68
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8af7774c7aca6f3b595d0417b92f543ce0c7b537)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a837c4f2df96a30bf9aa4115b426d608487c7101'
Michael Niedermayer [Sun, 17 Nov 2013 00:48:57 +0000 (01:48 +0100)]
Merge commit 'a837c4f2df96a30bf9aa4115b426d608487c7101'

* commit 'a837c4f2df96a30bf9aa4115b426d608487c7101':
  zmbvenc: use the AVFrame API properly.
  flicvideo: use the AVFrame API properly.
  smacker: use the AVFrame API properly.
  mmvideo: use the AVFrame API properly.

Conflicts:
libavcodec/flicvideo.c
libavcodec/mmvideo.c
libavcodec/smacker.c
libavcodec/zmbvenc.c

See: 76e27b1d0594199b4b1ff8520312069f42373944
See: 099e57bc38d7e53cf6823dfec349ff9fdaee99ba
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fe3808eddee81ce4712d1e729fa6fe619f1685c8)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2e09096da912f563c4dd889a8f25c314529bbaa6'
Michael Niedermayer [Sun, 17 Nov 2013 00:36:26 +0000 (01:36 +0100)]
Merge commit '2e09096da912f563c4dd889a8f25c314529bbaa6'

* commit '2e09096da912f563c4dd889a8f25c314529bbaa6':
  kgv1: use the AVFrame API properly.
  indeo2: use the AVFrame API properly.
  iff: use the AVFrame API properly.
  msrle: use the AVFrame API properly.

Conflicts:
libavcodec/iff.c
libavcodec/indeo2.c
libavcodec/kgv1dec.c
libavcodec/msrle.c

See: 451b2ca1b4349f9b60416cc057eaf5518d81025c
See: 80e9e63c946660304fc65fa8141ccfdbe4d196d1
See: 057dce5f21cd70db1ef6e3b67644a39f0d51aba5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9f890a165666a73376c73b3c2bd920345b5c3b79)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'b7462a3904d71ff799584faf5b875cad59ca2f31'
Michael Niedermayer [Sun, 17 Nov 2013 00:16:26 +0000 (01:16 +0100)]
Merge commit 'b7462a3904d71ff799584faf5b875cad59ca2f31'

* commit 'b7462a3904d71ff799584faf5b875cad59ca2f31':
  jvdec: use the AVFrame API properly.

Conflicts:
libavcodec/jvdec.c

See: 678431d3f2c5f35fe48b02d5035604ace742be2e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ddfdcd2b5ecce0914c1eefa6269060bdbc879b17)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit '2d2a92f72199823a92e4e226c32e42a27ec801c0'
Michael Niedermayer [Sun, 17 Nov 2013 00:07:37 +0000 (01:07 +0100)]
Merge commit '2d2a92f72199823a92e4e226c32e42a27ec801c0'

* commit '2d2a92f72199823a92e4e226c32e42a27ec801c0':
  dxa: use the AVFrame API properly.
  qpeg: use the AVFrame API properly.
  cin video: use the AVFrame API properly.
  msvideo1: use the AVFrame API properly.

Conflicts:
libavcodec/dsicinav.c
libavcodec/dxa.c
libavcodec/msvideo1.c
libavcodec/qpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5219afc09d8e97e18917738cbc052f903df9a619)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9'
Michael Niedermayer [Sat, 16 Nov 2013 23:40:59 +0000 (00:40 +0100)]
Merge commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9'

* commit 'a639ea7f4bc44bf6bfa452675558a342924a66a9':
  escape124: use the AVFrame API properly.
  qtrle: use the AVFrame API properly.
  cljr: use the AVFrame API properly.
  cinepak: use the AVFrame API properly.

Conflicts:
libavcodec/cinepak.c
libavcodec/cljr.c
libavcodec/qtrle.c

See: 80e9e63c libavcodec/cinepak.c
See: 71c378984b0bd5470f67c424a79a4750f84d2d3e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bfb1f44d246f4ed97d5cad9c1eace8a20951ff76)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoMerge commit 'cec5ce49229d61e4eb1f331a6d0dff3aa24f6655'
Michael Niedermayer [Sat, 16 Nov 2013 23:21:16 +0000 (00:21 +0100)]
Merge commit 'cec5ce49229d61e4eb1f331a6d0dff3aa24f6655'

* commit 'cec5ce49229d61e4eb1f331a6d0dff3aa24f6655':
  cdxl: remove an unused variable
  c93: use the AVFrame API properly.
  bethsoftvid: use the AVFrame API properly.
  avs: use the AVFrame API properly.

Conflicts:
libavcodec/bethsoftvideo.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 21c41e76d7c1ddaadafc9da50e99db51358f3754)

Conflicts:

libavcodec/avs.c
Author of the merged code: Anton Khirnov

5 years agoMerge commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf'
Michael Niedermayer [Sat, 16 Nov 2013 23:11:33 +0000 (00:11 +0100)]
Merge commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf'

* commit '6139f481ac9feb1bee4e7d04789fb15d7f24ebbf':
  asvenc: use the AVFrame API properly.
  a64multienc: use the AVFrame API properly.

Conflicts:
libavcodec/vaapi_mpeg.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cc4a6435638fa2a471fef048a3e68eaf7e6e306c)

Author of the merged code: Anton Khirnov
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: Clear ERContext.cur_pic when unref'ing current picture.
Dale Curtis [Thu, 2 Jan 2014 22:29:38 +0000 (14:29 -0800)]
h264: Clear ERContext.cur_pic when unref'ing current picture.

Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
(cherry picked from commit 4feca2214a0b69dcbe4d1c7cd145c3881459e867)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoconfigure: support raising major version in soname
Michael Niedermayer [Wed, 18 Dec 2013 04:20:11 +0000 (05:20 +0100)]
configure: support raising major version in soname

this allows seperate installation of shared libs that should not conflict with
whatever is already installed.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 102b794e09482fec881e7ec903e57914895f9b74)

Conflicts:

libavcodec/utils.c

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoswscale/utils: fill xyz tables only when they will be used
Michael Niedermayer [Sat, 7 Dec 2013 01:04:31 +0000 (02:04 +0100)]
swscale/utils: fill xyz tables only when they will be used

makes the first call to sws_getContext() 1ms faster

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 4d18060e56aac9d7248854ba75d5fc19f5cd3db8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavutil/log: skip IO calls on empty strings
Michael Niedermayer [Fri, 6 Dec 2013 22:30:34 +0000 (23:30 +0100)]
avutil/log: skip IO calls on empty strings

These occur when no context is set for example, thus they are common

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a044a183a3fb90b20a8deaa3ea1158510bcdd420)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodo O(1) instead of O(n) atomic operations in register functions
Michael Niedermayer [Fri, 6 Dec 2013 14:24:10 +0000 (15:24 +0100)]
do O(1) instead of O(n) atomic operations in register functions

about 1ms faster startup time

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 133fbfc7811ffae7b97dd129fcd0b5e646742362)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/g2meet: fix stride calculation, use correct format field
Michael Niedermayer [Tue, 26 Nov 2013 22:27:21 +0000 (23:27 +0100)]
avcodec/g2meet: fix stride calculation, use correct format field

Fixes out of array accesses
Fixes: asan_heap-oob_ae5f63_5415_g2m4.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 83f7bd6dcf00875725c5f3b7e1bedac5a6b3c77d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/libopusenc: change default frame duration to 20 ms
Paul B Mahol [Fri, 15 Nov 2013 01:09:06 +0000 (01:09 +0000)]
avcodec/libopusenc: change default frame duration to 20 ms

20 ms is used by libopus encoder.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
(cherry picked from commit 74906d3727ec3bd9b7b28dfa7a98ff6e8cf8b6d7)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/matroskadec ReferenceBlock is a signed integer
Jan Gerber [Sat, 16 Nov 2013 00:12:20 +0000 (01:12 +0100)]
lavf/matroskadec ReferenceBlock is a signed integer

according to the Matroska Specification
ReferenceBlock is a signed integer too.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8cc59ec881b8706fb3036a2a83f7ededa468dedb)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/matroska*: DiscardPadding is a signed integer
Jan Gerber [Thu, 14 Nov 2013 11:58:28 +0000 (12:58 +0100)]
lavf/matroska*: DiscardPadding is a signed integer

according to the Matriska Specification
 http://matroska.org/technical/specs/index.html
DiscardPadding is a signed integer.

Tested-by: Jan Gerber <j@v2v.cc>
Tested-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f4b1ca99ff86c6ba78e1b4730c85eac0d5a5817a)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/matroska: simplify signed int access code
Michael Niedermayer [Fri, 15 Nov 2013 20:30:30 +0000 (21:30 +0100)]
avformat/matroska: simplify signed int access code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cddd15ba5c9cd2e92d2f2942e0fc40bf3bf56115)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/matroska*: add support for signed integers
Jan Gerber [Fri, 15 Nov 2013 18:00:37 +0000 (19:00 +0100)]
lavf/matroska*: add support for signed integers

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d03eea36b2c329241f63c8aca2d6adbb6ea81d9c)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeg2000dec: Check precno before using it in JPEG2000_PGOD_CPRL
Michael Niedermayer [Sun, 24 Nov 2013 02:50:20 +0000 (03:50 +0100)]
avcodec/jpeg2000dec: Check precno before using it in JPEG2000_PGOD_CPRL

Fixes out of array reads
Fixes: asan_heap-oob_f0de57_6823_mjp2.mov

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3d5a5e86be2a65e33c34ab3ad7923f54e8e49c1d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec: move end zeroing code from av_packet_split_side_data() to avcodec_decode_sub...
Michael Niedermayer [Thu, 21 Nov 2013 01:32:37 +0000 (02:32 +0100)]
avcodec: move end zeroing code from av_packet_split_side_data() to avcodec_decode_subtitle2()

This code changes the input packet, which is read only and can in
rare circumstances lead to decoder errors. (i run into one of these in
the audio decoder, which corrupted the packet during av_find_stream_info()
so that actual decoding that single packet failed later)
Until a better fix is implemented, this commit limits the problem.
A better fix might be to make the subtitle decoders not depend on
data[size] = 0 or to copy their input when this is not the case.
(cherry picked from commit 01923bab98506b1e98b4cbf08419364ce6ffea6d)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavfilter/vf_format: check that the format list is not empty
Michael Niedermayer [Sun, 5 Jan 2014 19:14:03 +0000 (20:14 +0100)]
avfilter/vf_format: check that the format list is not empty

Fixes Ticket3210

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ee16e0cacc16ea60c35a66796410012755263c3c)

5 years agoavformat/oggdec: dont read timestamps from EOS pages of ogm videos
Michael Niedermayer [Sat, 4 Jan 2014 16:33:59 +0000 (17:33 +0100)]
avformat/oggdec: dont read timestamps from EOS pages of ogm videos

Some muxers store invalid timestamps there, which breaks seeking
Fixes Ticket2739

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5e0c7eab2a9d43e6e3be967ec1a6b04a3e0328da)

5 years agomatroskadec: Fix bug when parsing realaudio codec parameters
James Almer [Tue, 24 Dec 2013 23:26:32 +0000 (20:26 -0300)]
matroskadec: Fix bug when parsing realaudio codec parameters

flavor can be 0.

This fixes tract ticket #3214

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0d944ee34349805b29f9c91b15c8009d16df01ab)

5 years agoconfigure: Special case libfreetype test
Alexander Strasser [Fri, 6 Dec 2013 16:20:26 +0000 (17:20 +0100)]
configure: Special case libfreetype test

Include the freetype header, in-directly through a macro, like it
is done in the drawtext filter. Do not break if the header is moved.

Unfortunately the drawtext filter included the file where the include
macros are defined in a wrong way. This is not needed and breaks the
build. Remove that #include line too.

(cherry picked from commit cea5812fa723c08b89d929eeba73462e05de2973)

Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
5 years agonutenc/write_index: warn if 2 consecutive keyframes have the same PTS and discard...
Michael Niedermayer [Sun, 22 Dec 2013 17:47:28 +0000 (18:47 +0100)]
nutenc/write_index: warn if 2 consecutive keyframes have the same PTS and discard the 2nd

This fixes an assertion failure and regression and restores previous behaviour
Fixes Ticket3197

An alternative would be to fail hard in this case and refuse to mux such data.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit de2a2caf4dedb28a959d0ff6f02751bb6c3ff033)

5 years agowtvenc: populate VIDEOINFOHEADER2
Peter Ross [Mon, 23 Dec 2013 09:37:28 +0000 (20:37 +1100)]
wtvenc: populate VIDEOINFOHEADER2

Fixes ticket #2835.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6da21c1f8190d674fd1e5619bb148c1bbab8ca3c)

5 years agoavformat/riffenc: indent
Peter Ross [Mon, 23 Dec 2013 09:37:13 +0000 (20:37 +1100)]
avformat/riffenc: indent

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f93b0abe4041b75f0dbb590ee932b37a07662856)

5 years agoriffenc: add option to ff_put_bmp_header to ignore extradata
Peter Ross [Mon, 23 Dec 2013 09:37:00 +0000 (20:37 +1100)]
riffenc: add option to ff_put_bmp_header to ignore extradata

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fcbb94712d9873a37cdc8b526e368154b5982186)

5 years agoVC1: Fix intensity compensation performance regression
Mason Carter [Sun, 22 Dec 2013 01:27:18 +0000 (17:27 -0800)]
VC1: Fix intensity compensation performance regression

Fix https://trac.ffmpeg.org/ticket/3204

The problem was that intensity compensation was always used once it was
encountered. This is because v->next_use_ic was never set back to zero.
To fix this, when resetting v->next_luty/uv, also reset v->next_use_ic.

This improved (restored) performance by 85% when decoding
http://bit.ly/bbbwmv

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ed5bed4152203aed8cce01a679bed67bbda8903f)

5 years agoarm: Don't clobber callee saved registers in scalarproduct
Martin Storsjö [Fri, 20 Dec 2013 13:02:35 +0000 (15:02 +0200)]
arm: Don't clobber callee saved registers in scalarproduct

q4-q7/d8-d15 are supposed to not be clobbered by the callee.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
(cherry picked from commit d307e408d4a9ada22df443cc38be77cc5e492694)

5 years agoswscale/utils: check chroma width for fast bilinear scaler
Michael Niedermayer [Sun, 15 Dec 2013 13:13:55 +0000 (14:13 +0100)]
swscale/utils: check chroma width for fast bilinear scaler

Fixes artifacts where fast bilinear was used for downscaling chroma

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 037fc3b054b10aee0f11fdbe835e5dffa8e95b37)

5 years agoswscale/utils: remove useless ()
Michael Niedermayer [Sun, 15 Dec 2013 13:10:02 +0000 (14:10 +0100)]
swscale/utils: remove useless ()

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 554e913fd7acc9da02ddac2c5ce9487f7f633c92)

5 years agoavcodec/cabac: force get_cabac to be not inlined
Michael Niedermayer [Thu, 5 Dec 2013 00:41:10 +0000 (01:41 +0100)]
avcodec/cabac: force get_cabac to be not inlined

works around bug in gccs inline asm register assignment
Fixes Ticket3177

gcc from 4.4 to 4.6 is affected at least, no non affected gccs known
clang seems not affected

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0538b29ae8002c44f27bae8a1a6fc6e646998be5)

5 years agoavcodec/error_resilience: check that er is supported before attempting to read the...
Michael Niedermayer [Fri, 6 Dec 2013 15:49:35 +0000 (16:49 +0100)]
avcodec/error_resilience: check that er is supported before attempting to read the status of the previous slice

Fixes incorrectly set error_occured and improves speed

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 90539cea336fd513c47295a03c164cb4a851166f)

5 years agoavcodec/error_resilience: factor er_supported() check out
Michael Niedermayer [Fri, 6 Dec 2013 15:49:00 +0000 (16:49 +0100)]
avcodec/error_resilience: factor er_supported() check out

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit afb18c55783362546b5e512ce01b7fe7bf5744d9)

5 years agoavfilter/vf_pad: fix req_end
Michael Niedermayer [Tue, 3 Dec 2013 03:08:37 +0000 (04:08 +0100)]
avfilter/vf_pad: fix req_end

Fixes out of array accesses
Fixes Ticket3190

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 0cc5011f9a1b05132f9a20a71feb031f30a8a53b)

5 years agoavcodec/h264_refs: improve key frame detection heuristic
Michael Niedermayer [Mon, 2 Dec 2013 01:36:58 +0000 (02:36 +0100)]
avcodec/h264_refs: improve key frame detection heuristic

Fixes Ticket3186

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit e3d7a3978b857e32b32575ff78ecc7d67a18687e)

5 years agoavcodec/h264_refs: split conditions of if() up for better readability
Michael Niedermayer [Mon, 2 Dec 2013 01:12:39 +0000 (02:12 +0100)]
avcodec/h264_refs: split conditions of if() up for better readability

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ab6ea7a81921a168575be63b3d9049ca716e707a)

Conflicts:
libavcodec/h264_refs.c

5 years agolavc/srtenc: use bprint for text buffers.
Nicolas George [Mon, 25 Nov 2013 15:27:41 +0000 (16:27 +0100)]
lavc/srtenc: use bprint for text buffers.

Fix trac ticket #3120.
(cherry picked from commit 4b1c9b720e11d200ca7090210b34c409f43fafeb)

5 years agoffmpeg: set VCFR when copying timestamps
Michael Niedermayer [Thu, 28 Nov 2013 01:28:50 +0000 (02:28 +0100)]
ffmpeg: set VCFR when copying timestamps

This fixes unreasonable initial frame repeats
Fixes Ticket3176

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 738ebb4a0e0c8fbdc83b44cf30b8c9b7ac866270)

5 years agolavfi/af_pan: support unknown layouts on input.
Nicolas George [Fri, 25 Oct 2013 14:12:06 +0000 (16:12 +0200)]
lavfi/af_pan: support unknown layouts on input.

Fix trac ticket #2899.
(cherry picked from commit 7b0a587393e03dab552d66450d43ab82bda0a5a1)

5 years agolavfi/af_pan: support unknown layouts on output.
Nicolas George [Fri, 25 Oct 2013 14:02:04 +0000 (16:02 +0200)]
lavfi/af_pan: support unknown layouts on output.
(cherry picked from commit 4e9adc9b7363cc336e3d47c98455e1508902fd29)

5 years agolswr: fix assert failure on unknown layouts.
Nicolas George [Fri, 25 Oct 2013 14:11:30 +0000 (16:11 +0200)]
lswr: fix assert failure on unknown layouts.
(cherry picked from commit 4a640a6ac89099bfb02d6d3d3ada04e321a37476)

5 years agolavfi: parsing helper for unknown channel layouts.
Nicolas George [Fri, 25 Oct 2013 13:07:40 +0000 (15:07 +0200)]
lavfi: parsing helper for unknown channel layouts.

Make ff_parse_channel_layout() accept unknown layouts too.
(cherry picked from commit 6e2473edfda26a556c615ebc04d8aeba800bef7e)

5 years agolavfi/avfiltergraph: do not reduce incompatible lists.
Nicolas George [Tue, 3 Sep 2013 20:13:49 +0000 (22:13 +0200)]
lavfi/avfiltergraph: do not reduce incompatible lists.

A list of "all channel layouts" but not "all channel counts"
can not be reduced to a single unknown channel count.
(cherry picked from commit d300f5f6f570659e4b58567b35c9e8600c9f2956)

5 years agolavfi/avfiltergraph: suggest a solution when format selection fails.
Nicolas George [Tue, 3 Sep 2013 20:12:54 +0000 (22:12 +0200)]
lavfi/avfiltergraph: suggest a solution when format selection fails.

Format selection can fail if unknown channel layouts are used
with filters that do not support it.
(cherry picked from commit f775eb3fb4c7b716107355e428e40cb63f71ee7a)

5 years agolavd/lavfi: support unknown channel layouts.
Nicolas George [Mon, 28 Oct 2013 10:50:09 +0000 (11:50 +0100)]
lavd/lavfi: support unknown channel layouts.
(cherry picked from commit 863fb11f63f7f60feec390f3c54dd13606e07d05)

5 years agoupdate for 2.1.1 n2.1.1
Michael Niedermayer [Wed, 20 Nov 2013 02:12:11 +0000 (03:12 +0100)]
update for 2.1.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/pcm-dvd: fix 20/24bit 1 channel
Michael Niedermayer [Mon, 18 Nov 2013 19:56:40 +0000 (20:56 +0100)]
avcodec/pcm-dvd: fix 20/24bit 1 channel

Fixes part of ticket3122

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ab184b298d4a54199986de10927258aed18c7b6b)

5 years agoavcodec/pcm-dvd: fix 20bit 2 channels
Michael Niedermayer [Mon, 18 Nov 2013 19:56:40 +0000 (20:56 +0100)]
avcodec/pcm-dvd: fix 20bit 2 channels

Fixes part of ticket3122

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 5db49fc38d9132e134de92584f296559bec3b789)

5 years agoavformat/mpegts: fix resync seek
Michael Niedermayer [Mon, 18 Nov 2013 15:38:12 +0000 (16:38 +0100)]
avformat/mpegts: fix resync seek

The seek ended up seeking before the begin, which caused problems
Fixes initial sync issues with libbluray
Fixes Ticket3117

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7d0e927a31edb5fb584c2ab17f7fd676838d6639)

5 years agoavformat/utils: dont count attached pics toward the probesize
Michael Niedermayer [Mon, 18 Nov 2013 02:02:36 +0000 (03:02 +0100)]
avformat/utils: dont count attached pics toward the probesize

Such pics behave more like headers which we also dont count.
Fixes Ticket3146

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a8dec360c5db15e8da4b44ff3c0f02a6c57e8ac0)

5 years agobuild: avoid stdin stall with GNU AS probing.
Clément Bœsch [Fri, 8 Nov 2013 22:55:06 +0000 (23:55 +0100)]
build: avoid stdin stall with GNU AS probing.

a758c5e added probing for various tools, such as AS. Unfortunately, GNU
AS is reading stdin with -v, and thus configure is stalled with
configure arguments such as --as=as.

Fixes Ticket #1898.
(cherry picked from commit dbb41f93c16cbc65a899a75723c95da51c851cd5)

5 years agoavformat/image2: allow muxing gif files.
Clément Bœsch [Sat, 19 Oct 2013 17:39:28 +0000 (19:39 +0200)]
avformat/image2: allow muxing gif files.

Fixes Ticket #2936.
(cherry picked from commit f70db22999d713da3306bf29ec763d670b9bf1ea)

5 years agoavcodec/tiff_common: allow count = 0 in ff_tadd_bytes_metadata()
Michael Niedermayer [Thu, 31 Oct 2013 22:29:01 +0000 (23:29 +0100)]
avcodec/tiff_common: allow count = 0 in ff_tadd_bytes_metadata()

Fixes Ticket3103

Reviewed-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 73d887733dc2ccb5d570615a753d5c44c3f1d9a4)

5 years agoFix example in pullup documentation.
Lou Logan [Tue, 12 Nov 2013 13:22:15 +0000 (14:22 +0100)]
Fix example in pullup documentation.

The pullup filter does not work well with the fps filter, it
currently needs -r

Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
(cherry picked from commit 6d90a5c149fbdf9678c3f03fac820f835665b985)

5 years agoavutil: reintroduce lls1 as the 52 ABI needs it
Michael Niedermayer [Fri, 15 Nov 2013 22:32:51 +0000 (23:32 +0100)]
avutil: reintroduce lls1 as the 52 ABI needs it

lls1 taken from ff130d7

This is incompatible with libavcodec version
55.18.100 to 55.43.100 except 55.39.101
This incompatibility is caused by these libavcodec versions depending on
a libavutil 52 which is ABI incompatible with the previous ABI 52

you can avoid this incompatibility by upgrading your libavcodec so it
does no longer depend on the invalid ABI

See: 502ab21af0ca68f76d6112722c46d2f35c004053
See: cc6714bb16b1f0716ba43701d47273dbe9657b8b
See: 41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2
See: Ticket3136
Tested-by: marillat
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b382d09d29be90e0947295a70cdcbaa60b9030b8)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agorename new lls code to lls2 to avoid conflict with the old which has a different ABI
Michael Niedermayer [Sat, 16 Nov 2013 15:42:57 +0000 (16:42 +0100)]
rename new lls code to lls2 to avoid conflict with the old which has a different ABI

also remove failed attempt at a compatibility layer, the code simply cannot work

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c3814ab654a993723b0e5f14cc252d68f233ad79)

Conflicts:

libavcodec/version.h

5 years agoavutil: rename lls to lls2
Michael Niedermayer [Fri, 15 Nov 2013 21:35:46 +0000 (22:35 +0100)]
avutil: rename lls to lls2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bbe66ef912470007f7cc424badde2ccec500b36b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoffmpeg: Do not fill gap before the first decodable frame on single stream input files...
Michael Niedermayer [Thu, 14 Nov 2013 00:21:20 +0000 (01:21 +0100)]
ffmpeg: Do not fill gap before the first decodable frame on single stream input files unless the user explicitly requests it.

Fixes different behavior to JM and probably several if not all
reference decoders.

We cannot just do this unconditionally as it would ruin AV sync in
some use cases.

Bug-Found-by: BugMaster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d7ebeba80c609e160a171168b3434c342a652237)

Conflicts:

ffmpeg.c

5 years agompeg12dec: Remove incomplete and wrong UV swapping code for VCR2
Diego Biurrun [Wed, 13 Nov 2013 17:44:25 +0000 (18:44 +0100)]
mpeg12dec: Remove incomplete and wrong UV swapping code for VCR2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 321514042534a2501a9f6223b88f0d2b8060f858)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agompegvideo: Fix swapping of UV planes for VCR2
Kostya Shishkov [Wed, 13 Nov 2013 17:44:26 +0000 (18:44 +0100)]
mpegvideo: Fix swapping of UV planes for VCR2

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit bae14f38d992f326c94d93f01197ccd84ea62053)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoh264: Do not treat the initial frame special in handling of frame gaps
Michael Niedermayer [Thu, 14 Nov 2013 10:27:45 +0000 (11:27 +0100)]
h264: Do not treat the initial frame special in handling of frame gaps

The not handling of frame gaps has lead to the lack of a dummy reference
frame, which has lead to the failure of decode_slice_header() which has
lead to one SEI recovery message being skiped which had introduced a
slightly suboptimal recovery point for at least 1 h264 file compared to
JM.

Found-by: Carl & BugMaster
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 9e5ef1c5c37208326c59d642e2dc7afd3f10b09b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/ffv1enc: Check high bpp RGB against coder type too
Michael Niedermayer [Sun, 3 Nov 2013 21:11:11 +0000 (22:11 +0100)]
avcodec/ffv1enc: Check high bpp RGB against coder type too

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/utils: never decrease has_b_frames in compute_pkt_fields()
Michael Niedermayer [Sun, 3 Nov 2013 20:26:40 +0000 (21:26 +0100)]
avformat/utils: never decrease has_b_frames in compute_pkt_fields()

The intent of the original check was to increase has_b_frames when
it was incorrectly set to 0. Later codecs allowed larger values

Found-by: divVerent
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 8b73a3f6f6598cb9249034fa020ddead3c943e2f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/cabac: support UNCHECKED_BITSTREAM_READER = 0
Michael Niedermayer [Thu, 31 Oct 2013 09:54:46 +0000 (10:54 +0100)]
avcodec/cabac: support UNCHECKED_BITSTREAM_READER = 0

Fixes overreads in HEVC
Fixes Ticket3070
Also fixed remaining issues from Ticket3075 and Ticket3076

Some lines of code taken from  0c5f839693da2276c2da23400f67a67be4ea0af1:libavcodec/x86/cabac.h
and                            0c5f839693da2276c2da23400f67a67be4ea0af1:libavcodec/cabac_functions.h

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fa6fa2162b730336fc1d6ee0d547dcc81f4afbad)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/thp: force moving forward
Michael Niedermayer [Thu, 31 Oct 2013 01:26:07 +0000 (02:26 +0100)]
avformat/thp: force moving forward

Fixes infinite loop
Fixes Ticket3098

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 6c4b87d3d6ae08a6da16b4616626b4d2a726afbf)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/thp: fix variable types to avoid overflows
Michael Niedermayer [Thu, 31 Oct 2013 01:19:40 +0000 (02:19 +0100)]
avformat/thp: fix variable types to avoid overflows

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 2b1056e4e27b046af3777e8bd65a5145abff878f)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavcodec/jpeglsdec: check err value for ls_get_code_runterm()
Michael Niedermayer [Wed, 30 Oct 2013 22:27:28 +0000 (23:27 +0100)]
avcodec/jpeglsdec: check err value for ls_get_code_runterm()

Fixes infinite loop
Fixes Ticket3086

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cc0e47b55096361723b364afa43b79a3f5619cdc)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agolavf/spdifdec: fix demuxing of AAC in IEC 61937
Anssi Hannula [Tue, 29 Oct 2013 20:25:27 +0000 (22:25 +0200)]
lavf/spdifdec: fix demuxing of AAC in IEC 61937

Return value of avpriv_aac_parse_header() is not checked correctly. Fix
it.

Signed-off-by: Anssi Hannula <anssi.hannula@iki.fi>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f86387b6c2b11650cb9d5a8fd886be76e48c665b)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavformat/http: fix cookies
Michael Niedermayer [Thu, 31 Oct 2013 00:42:13 +0000 (01:42 +0100)]
avformat/http: fix cookies

Fixes Ticket3096

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit b73900b8a6c0a23e63e84a5eed0a5b9b3ffe1198)

5 years agoavcodec/bink: fix seeking to frame 0
Michael Niedermayer [Wed, 30 Oct 2013 22:56:52 +0000 (23:56 +0100)]
avcodec/bink: fix seeking to frame 0

Fixes Ticket3088

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit cb52d6da0a9c88c584a38a9a7a94825565854b7e)

5 years agoupdate for 2.1 n2.1
Michael Niedermayer [Mon, 28 Oct 2013 00:14:54 +0000 (01:14 +0100)]
update for 2.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agodoc/RELEASE_NOTES: update for 2.1
Michael Niedermayer [Mon, 28 Oct 2013 00:13:46 +0000 (01:13 +0100)]
doc/RELEASE_NOTES: update for 2.1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
5 years agoavdevice/pulse_audio_enc: remove double ;
Michael Niedermayer [Sun, 27 Oct 2013 23:52:11 +0000 (00:52 +0100)]
avdevice/pulse_audio_enc: remove double ;

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>