ffmpeg.git
6 years agoMerge commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80'
Michael Niedermayer [Mon, 31 Mar 2014 19:58:26 +0000 (21:58 +0200)]
Merge commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80'

* commit '654c7446a806c5dc8ec7800874c49a4c1ba2ce80':
  vc1dec: improve hwaccel #ifdefs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '33259118155764ce27a3433894659dda1d148b5f'
Michael Niedermayer [Mon, 31 Mar 2014 19:49:58 +0000 (21:49 +0200)]
Merge commit '33259118155764ce27a3433894659dda1d148b5f'

* commit '33259118155764ce27a3433894659dda1d148b5f':
  h263: improve hwaccel #ifdefs

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'c042cbc3a68d09a20cfd75fb4a4eff0534253081'
Michael Niedermayer [Mon, 31 Mar 2014 18:34:18 +0000 (20:34 +0200)]
Merge commit 'c042cbc3a68d09a20cfd75fb4a4eff0534253081'

* commit 'c042cbc3a68d09a20cfd75fb4a4eff0534253081':
  libx265: Use the repeat headers flag when not using global headers

See: 1b28d9b357db2b6f8360e68c03247d3b81655b10
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'cd60631752cafe106b406f00966ac0323ad2ce1f'
Michael Niedermayer [Mon, 31 Mar 2014 18:24:45 +0000 (20:24 +0200)]
Merge commit 'cd60631752cafe106b406f00966ac0323ad2ce1f'

* commit 'cd60631752cafe106b406f00966ac0323ad2ce1f':
  libx265: Bump version requirement

See: 32998ee9577ab32d11c4704fde527df0e982092d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovc1dec: improve hwaccel #ifdefs
Rémi Denis-Courmont [Tue, 25 Mar 2014 20:19:58 +0000 (20:19 +0000)]
vc1dec: improve hwaccel #ifdefs

6 years agoh263: improve hwaccel #ifdefs
Rémi Denis-Courmont [Tue, 25 Mar 2014 20:19:57 +0000 (20:19 +0000)]
h263: improve hwaccel #ifdefs

6 years agoavcodec/mjpegdec: support subsampled 420 CMYK
Michael Niedermayer [Mon, 31 Mar 2014 15:04:38 +0000 (17:04 +0200)]
avcodec/mjpegdec: support subsampled 420 CMYK

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mjpegdec: upgrade upscale_v to support multiple planes
Michael Niedermayer [Mon, 31 Mar 2014 13:52:15 +0000 (15:52 +0200)]
avcodec/mjpegdec: upgrade upscale_v to support multiple planes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/mjpegdec: upgrade upscale_h to support multiple planes
Michael Niedermayer [Mon, 31 Mar 2014 13:27:41 +0000 (15:27 +0200)]
avcodec/mjpegdec: upgrade upscale_h to support multiple planes

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibx265: Use the repeat headers flag when not using global headers
Marcus Gustafsson [Tue, 25 Mar 2014 20:51:21 +0000 (21:51 +0100)]
libx265: Use the repeat headers flag when not using global headers

This allows proper muxing and seeking in things like MPEG-TS, by
placing headers by random access points.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Bump version requirement
Derek Buitenhuis [Sun, 30 Mar 2014 14:58:14 +0000 (15:58 +0100)]
libx265: Bump version requirement

Build 13 has a crucial fix which makes x265_encode_headers work
as its always been documented.

Previous to this, the check was incorrect.

Also allows for use of the repeat headers flag.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Use the repeat headers flag when not using global headers
Marcus Gustafsson [Tue, 25 Mar 2014 20:51:21 +0000 (21:51 +0100)]
libx265: Use the repeat headers flag when not using global headers

This allows proper muxing and seeking in things like MPEG-TS, by
placing headers by random access points.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agolibx265: Bump version requirement
Derek Buitenhuis [Sun, 30 Mar 2014 14:58:14 +0000 (15:58 +0100)]
libx265: Bump version requirement

Build 13 has a crucial fix which makes x265_encode_headers work
as its always been documented.

Previous to this, the check was incorrect.

Also allows for use of the repeat headers flag.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
6 years agoavcodec/adpcm: also squelch 'mismatch in coded sample count' warning for AV_CODEC_ID_...
Peter Ross [Mon, 31 Mar 2014 10:56:43 +0000 (21:56 +1100)]
avcodec/adpcm: also squelch 'mismatch in coded sample count' warning for AV_CODEC_ID_ADPCM_EA_R1

AV_CODEC_ID_ADPCM_EA_R1/R2/R3 all use an internal offset. For some
samples there is padding between the offset table and ADPCM data.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoconfigure: Remove invalid option --disable-qtkit.
Thilo Borgmann [Mon, 31 Mar 2014 10:12:02 +0000 (12:12 +0200)]
configure: Remove invalid option --disable-qtkit.

QTKit can/should be disabled by "--disable-indev=qtkit".

Found by Justin Derrick.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/vf_pullup: fix gray8
Michael Niedermayer [Mon, 31 Mar 2014 01:22:20 +0000 (03:22 +0200)]
avfilter/vf_pullup: fix gray8

Fixes segfault
Fixes Ticket3469

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Mon, 31 Mar 2014 00:21:57 +0000 (02:21 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  libmp3lame: add ABR support

Conflicts:
libavcodec/libmp3lame.c
libavcodec/version.h

See: d3211cfaedcc0abf30e3a40c246237090ad95b6d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73'
Michael Niedermayer [Mon, 31 Mar 2014 00:18:24 +0000 (02:18 +0200)]
Merge commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73'

* commit '292dbe5e8a95d38c1324b0432fbaca67f8fe4b73':
  libmp3lame: add comments about CBR/VBR modes

Conflicts:
libavcodec/libmp3lame.c

See: 07e7bc9cbda12921ddf0ae6bbbf9328f29c3c63e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '729d821fd864a0568f4068e64d3a70faa23b9309'
Michael Niedermayer [Mon, 31 Mar 2014 00:15:11 +0000 (02:15 +0200)]
Merge commit '729d821fd864a0568f4068e64d3a70faa23b9309'

* commit '729d821fd864a0568f4068e64d3a70faa23b9309':
  libmp3lame: allow joint stereo to be disabled

Conflicts:
libavcodec/libmp3lame.c
libavcodec/version.h

See: 1de11a7cab5346030a134774fbc23b3fc523a003
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '12789d96361ed8e9804bfbb9db31ea4110e75c58'
Michael Niedermayer [Mon, 31 Mar 2014 00:08:45 +0000 (02:08 +0200)]
Merge commit '12789d96361ed8e9804bfbb9db31ea4110e75c58'

* commit '12789d96361ed8e9804bfbb9db31ea4110e75c58':
  mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd

Conflicts:
libavformat/isom.c

See: e21235f9b9e264111279847617bb7bdaa734b11a
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8'
Michael Niedermayer [Sun, 30 Mar 2014 23:55:58 +0000 (01:55 +0200)]
Merge commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8'

* commit 'fce28c3c6d603b7f42a5dbe36bf240d0470469c8':
  mov: fill in subtitle dimensions after parsing tkhd

See: 8ba432bc56f2d3ef534be7d3ccc1c9b3c0ea3091
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '96138e8c8da4b9397e627c934a33c22988d1192b'
Michael Niedermayer [Sun, 30 Mar 2014 23:51:34 +0000 (01:51 +0200)]
Merge commit '96138e8c8da4b9397e627c934a33c22988d1192b'

* commit '96138e8c8da4b9397e627c934a33c22988d1192b':
  isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()

Conflicts:
libavformat/isom.c

See: b6ad5893ce585ac6d0a5a4750cba6bb700dbc902
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3'
Michael Niedermayer [Sun, 30 Mar 2014 23:41:21 +0000 (01:41 +0200)]
Merge commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3'

* commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3':
  isom: Simplify mov_rewrite_dvd_sub_extradata()

Conflicts:
libavformat/isom.c

See: f6f3c85c0eff54cebc3a45caa7a1e0454b5c9ff8
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a'
Michael Niedermayer [Sun, 30 Mar 2014 23:31:50 +0000 (01:31 +0200)]
Merge commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a'

* commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a':
  fate: Convert the paletted output in the brenderpix tests to rgb24

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolibmp3lame: add ABR support
Timothy Gu [Sat, 2 Nov 2013 02:43:24 +0000 (19:43 -0700)]
libmp3lame: add ABR support

6 years agolibmp3lame: add comments about CBR/VBR modes
Timothy Gu [Thu, 24 Oct 2013 03:57:36 +0000 (20:57 -0700)]
libmp3lame: add comments about CBR/VBR modes

6 years agolibmp3lame: allow joint stereo to be disabled
Paul B Mahol [Sat, 30 Mar 2013 22:15:50 +0000 (22:15 +0000)]
libmp3lame: allow joint stereo to be disabled

6 years agomov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd
Michael Niedermayer [Thu, 20 Mar 2014 07:05:37 +0000 (07:05 +0000)]
mov: call mov_rewrite_dvd_sub_extradata() after parsing dimensions from tkhd

This also moves mov_rewrite_dvd_sub_extradata() to mov.c.

Sample-Id: NeroRecodeSample.mp4

6 years agomov: fill in subtitle dimensions after parsing tkhd
Michael Niedermayer [Thu, 20 Mar 2014 07:05:36 +0000 (07:05 +0000)]
mov: fill in subtitle dimensions after parsing tkhd

Sample-Id: NeroRecodeSample.mp4

6 years agoisom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()
Michael Niedermayer [Thu, 20 Mar 2014 07:05:35 +0000 (07:05 +0000)]
isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata()

Sample-Id: NeroRecodeSample.mp4

6 years agoisom: Simplify mov_rewrite_dvd_sub_extradata()
Michael Niedermayer [Thu, 20 Mar 2014 07:05:34 +0000 (07:05 +0000)]
isom: Simplify mov_rewrite_dvd_sub_extradata()

This avoids the 2nd buffer and fixes the palette truncated check

6 years agofate: Convert the paletted output in the brenderpix tests to rgb24
Martin Storsjö [Sun, 30 Mar 2014 18:27:58 +0000 (18:27 +0000)]
fate: Convert the paletted output in the brenderpix tests to rgb24

This makes the output consistent on big-endian systems.

6 years agoUse intel compliant CDQ instead of CLTD in inline asm.
Matt Oliver [Sun, 30 Mar 2014 01:34:49 +0000 (12:34 +1100)]
Use intel compliant CDQ instead of CLTD in inline asm.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodoc/indevs: Fix example for QTKit usage.
Thilo Borgmann [Sun, 30 Mar 2014 19:14:17 +0000 (21:14 +0200)]
doc/indevs: Fix example for QTKit usage.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 30 Mar 2014 19:19:40 +0000 (21:19 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: make the ASCII flow charts narrower to fit onto TTY

Conflicts:
doc/ffmpeg.texi

See: 8fe107609437909ddd2cf8f5690fe0158a0616f2
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d'
Michael Niedermayer [Sun, 30 Mar 2014 19:08:45 +0000 (21:08 +0200)]
Merge commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d'

* commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d':
  dnxhdenc: return meaningful return codes

Conflicts:
libavcodec/dnxhdenc.c

See: b9bedb0b287d3aaa30540d18fdb87b2cc98ca339
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '9e4e35b4d7c43a908944183a58aa389a23116fd6'
Michael Niedermayer [Sun, 30 Mar 2014 18:58:45 +0000 (20:58 +0200)]
Merge commit '9e4e35b4d7c43a908944183a58aa389a23116fd6'

* commit '9e4e35b4d7c43a908944183a58aa389a23116fd6':
  avconv_opt: fix avio_open2() return code check

See: 774239be717150909219ad2c0696bfb6a50cf2cb
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd: Add QTKit input device.
Vadim Kalinsky [Mon, 24 Mar 2014 09:55:35 +0000 (10:55 +0100)]
lavd: Add QTKit input device.

Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavconv: make the ASCII flow charts narrower to fit onto TTY
Timothy Gu [Fri, 7 Feb 2014 00:20:58 +0000 (16:20 -0800)]
avconv: make the ASCII flow charts narrower to fit onto TTY

These charts in man page are currently destroyed.

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agoavformat/wtvenc: advise user when H264 startcode is not present
Peter Ross [Sun, 30 Mar 2014 01:42:05 +0000 (12:42 +1100)]
avformat/wtvenc: advise user when H264 startcode is not present

Fixes ticket #3473.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/mpegtsenc: move startcode validity check to ff_check_h264_startcode
Peter Ross [Sun, 30 Mar 2014 01:41:01 +0000 (12:41 +1100)]
avformat/mpegtsenc: move startcode validity check to ff_check_h264_startcode

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/avio: also set generic URL context options
Michael Niedermayer [Sun, 30 Mar 2014 12:51:59 +0000 (14:51 +0200)]
avformat/avio: also set generic URL context options

This should have no effect currently as there are no such options yet.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavutil/opt: dont crash on av_opt_set_dict() with NULL
Michael Niedermayer [Sun, 30 Mar 2014 12:58:46 +0000 (14:58 +0200)]
avutil/opt: dont crash on av_opt_set_dict() with NULL

This allows calling the function without the need to check if the
dictionary contains any entries

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodnxhdenc: return meaningful return codes
Timothy Gu [Sat, 29 Mar 2014 20:59:46 +0000 (20:59 +0000)]
dnxhdenc: return meaningful return codes

6 years agoavconv_opt: fix avio_open2() return code check
Timothy Gu [Sat, 29 Mar 2014 20:59:45 +0000 (20:59 +0000)]
avconv_opt: fix avio_open2() return code check

avio_open2() only return < 0 when error.

6 years agoavformat/wtvenc: pad judiciously when writing mpeg2 extradata
Peter Ross [Sun, 30 Mar 2014 01:43:50 +0000 (12:43 +1100)]
avformat/wtvenc: pad judiciously when writing mpeg2 extradata

Padding rule described here http://msdn.microsoft.com/en-us/library/windows/desktop/dd390707(v=vs.85).aspx

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/wtvdec: demux mpeg2 extradata
Peter Ross [Sun, 30 Mar 2014 01:43:19 +0000 (12:43 +1100)]
avformat/wtvdec: demux mpeg2 extradata

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/replaygain: remove unused variable
Michael Niedermayer [Sun, 30 Mar 2014 01:23:13 +0000 (03:23 +0200)]
avformat/replaygain: remove unused variable

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sun, 30 Mar 2014 01:02:43 +0000 (03:02 +0200)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  golomb: Fix the implementation of get_se_golomb_long

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5'
Michael Niedermayer [Sun, 30 Mar 2014 00:39:46 +0000 (01:39 +0100)]
Merge commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5'

* commit '53c20f17c78d1d8a0fc2505868f201e69ff59cc5':
  vp8: K&R formatting cosmetics

Conflicts:
libavcodec/vp8.c
libavcodec/vp8.h
libavcodec/vp8data.h
libavcodec/vp8dsp.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agogolomb: Fix the implementation of get_se_golomb_long
Martin Storsjö [Sat, 29 Mar 2014 10:35:11 +0000 (12:35 +0200)]
golomb: Fix the implementation of get_se_golomb_long

This was only used in hevc muxing code so far.

This makes the return values match what get_se_golomb returns for
the same bitstream reader instances.

The logic for producing a signed golomb code out of an unsigned one
was based on the corresponding code in get_se_golomb, which operated
directly on the bitstream reader buffer - not on the equivalent
return value from get_ue_golomb.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
6 years agoavcodec/vp9dsp: fix typo in mc doxy.
Clément Bœsch [Sat, 29 Mar 2014 16:28:37 +0000 (17:28 +0100)]
avcodec/vp9dsp: fix typo in mc doxy.

6 years agox86/vp9mc: add vp9 namespace.
Clément Bœsch [Fri, 28 Mar 2014 21:33:51 +0000 (22:33 +0100)]
x86/vp9mc: add vp9 namespace.

6 years agoMerge commit 'lukaszmluki/master^'
Michael Niedermayer [Sat, 29 Mar 2014 15:28:28 +0000 (16:28 +0100)]
Merge commit 'lukaszmluki/master^'

* commit 'lukaszmluki/master^':
  lavd/pulse_audio_enc: implement get_device_list callback
  lavd/pulse_audio_dec: implement get_device_list callback
  lavd/pulse_audio_common: add device detecting code
  lavu/mem: add av_dynarray_add_nofree function
  lavd/pulse_audio_enc: implement write_uncoded_frame callback
  tools/uncoded_frame: fix audio codec generation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agovp8: K&R formatting cosmetics
Vittorio Giovara [Fri, 28 Mar 2014 00:13:54 +0000 (01:13 +0100)]
vp8: K&R formatting cosmetics

Signed-off-by: Diego Biurrun <diego@biurrun.de>
6 years agoavformat/movenc: fix if vs if else
Michael Niedermayer [Sat, 29 Mar 2014 14:38:20 +0000 (15:38 +0100)]
avformat/movenc: fix if vs if else

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Sat, 29 Mar 2014 14:03:24 +0000 (15:03 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  movenc: Add dvd subtitle support

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '85698be461c07be10d873dd34348bcfe9ffc56e0'
Michael Niedermayer [Sat, 29 Mar 2014 13:33:10 +0000 (14:33 +0100)]
Merge commit '85698be461c07be10d873dd34348bcfe9ffc56e0'

* commit '85698be461c07be10d873dd34348bcfe9ffc56e0':
  cmdutils: Mark exit_program as av_noreturn

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agolavd/pulse_audio_enc: implement get_device_list callback
Lukasz Marek [Tue, 25 Feb 2014 00:04:15 +0000 (01:04 +0100)]
lavd/pulse_audio_enc: implement get_device_list callback

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd/pulse_audio_dec: implement get_device_list callback
Lukasz Marek [Tue, 25 Feb 2014 00:04:02 +0000 (01:04 +0100)]
lavd/pulse_audio_dec: implement get_device_list callback

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd/pulse_audio_common: add device detecting code
Lukasz Marek [Tue, 25 Feb 2014 00:03:56 +0000 (01:03 +0100)]
lavd/pulse_audio_common: add device detecting code

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavu/mem: add av_dynarray_add_nofree function
Lukasz Marek [Tue, 25 Feb 2014 00:06:06 +0000 (01:06 +0100)]
lavu/mem: add av_dynarray_add_nofree function

av_dynarray_add_nofree function have similar functionality
as existing av_dynarray_add, but it doesn't deallocate memory
on fails.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agolavd/pulse_audio_enc: implement write_uncoded_frame callback
Lukasz Marek [Mon, 24 Mar 2014 16:55:07 +0000 (17:55 +0100)]
lavd/pulse_audio_enc: implement write_uncoded_frame callback

Provided implementation doesn't support planar formats yet.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agotools/uncoded_frame: fix audio codec generation
Lukasz Marek [Mon, 24 Mar 2014 16:49:04 +0000 (17:49 +0100)]
tools/uncoded_frame: fix audio codec generation

Codec id is guessed from uninitialized sample format.

Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
6 years agoavcodec/vp7: check buffer size
Michael Niedermayer [Sat, 29 Mar 2014 03:25:50 +0000 (04:25 +0100)]
avcodec/vp7: check buffer size

Fixes overread
Fixes Ticket 3501
Found-by: Piotr Bandurski <ami_stuff@o2.pl>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/xbmdec: redesign parser to handle more cases
Michael Niedermayer [Sat, 29 Mar 2014 02:18:45 +0000 (03:18 +0100)]
avcodec/xbmdec: redesign parser to handle more cases

The new code is more tolerant on the syntax

Fixes decoding of bm1.xbm

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/img2_alias_pix: rewrite probe function
Michael Niedermayer [Fri, 28 Mar 2014 23:16:43 +0000 (00:16 +0100)]
avformat/img2_alias_pix: rewrite probe function

Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/img2dec: try to read PROBE_BUF_MIN instead of just enough for .pix probing
Michael Niedermayer [Fri, 28 Mar 2014 23:18:56 +0000 (00:18 +0100)]
avformat/img2dec: try to read PROBE_BUF_MIN instead of just enough for .pix probing

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/img2dec: Use avformat probing interface to identify format if it has not...
Michael Niedermayer [Fri, 28 Mar 2014 16:24:48 +0000 (17:24 +0100)]
avformat/img2dec: Use avformat probing interface to identify format if it has not been otherwise identified

This is used only for distinguishing .pix formats for now.
Which is the only case that has image2 demuxers currently

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: add image2 brender pix demuxer
Michael Niedermayer [Fri, 28 Mar 2014 16:24:10 +0000 (17:24 +0100)]
avformat: add image2 brender pix demuxer

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat: add image2 alias pix demuxer
Michael Niedermayer [Fri, 28 Mar 2014 16:23:32 +0000 (17:23 +0100)]
avformat: add image2 alias pix demuxer

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavformat/img2dec: make image2dec capable to be used from seperate demuxers
Michael Niedermayer [Fri, 28 Mar 2014 20:03:14 +0000 (21:03 +0100)]
avformat/img2dec: make image2dec capable to be used from seperate demuxers

Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavfilter/lavfutils: call av_find_stream_info() before reading various information...
Michael Niedermayer [Fri, 28 Mar 2014 15:10:10 +0000 (16:10 +0100)]
avfilter/lavfutils: call av_find_stream_info() before reading various information about the stream

No testcase with unmodified source is known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils/filter_codec_opts: do not discard all options for CODEC_ID_NONE
Michael Niedermayer [Fri, 28 Mar 2014 15:03:33 +0000 (16:03 +0100)]
cmdutils/filter_codec_opts: do not discard all options for CODEC_ID_NONE

This fixes cases where the codec is detect later than the stream creation
No testcase with unmodified source known

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agomovenc: Add dvd subtitle support
John Stebbins [Tue, 18 Mar 2014 14:50:25 +0000 (08:50 -0600)]
movenc: Add dvd subtitle support

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agofate/aliaspix: Use standard test sample
Michael Niedermayer [Fri, 28 Mar 2014 11:41:15 +0000 (12:41 +0100)]
fate/aliaspix: Use standard test sample

This also uses samples with odd resolution which should provide better coverage

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge remote-tracking branch 'qatar/master'
Michael Niedermayer [Fri, 28 Mar 2014 10:32:51 +0000 (11:32 +0100)]
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  fate: add a bmpparser test

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410'
Michael Niedermayer [Fri, 28 Mar 2014 09:59:16 +0000 (10:59 +0100)]
Merge commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410'

* commit 'fb5cf145b6bcfa4f83af94398e5560c1132cc410':
  bmp: add a standalone parser

Conflicts:
Changelog
libavcodec/bmp_parser.c
libavcodec/version.h

See: 011ce89dba5c0c764abc5f39acb6368f580742e3 and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022'
Michael Niedermayer [Fri, 28 Mar 2014 04:49:22 +0000 (05:49 +0100)]
Merge commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022'

* commit '991362fab49b60d34d89b7b7d6dd00fbec3ce022':
  fate: add XBM tests

Conflicts:
tests/fate/image.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/xbmdec: support X10 format
Michael Niedermayer [Fri, 28 Mar 2014 04:34:25 +0000 (05:34 +0100)]
avcodec/xbmdec: support X10 format

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec/xbmdec: merge ptr increase into dereference
Michael Niedermayer [Fri, 28 Mar 2014 04:33:13 +0000 (05:33 +0100)]
avcodec/xbmdec: merge ptr increase into dereference

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '678082b409aca711f9cf991df6b0200116489322'
Michael Niedermayer [Fri, 28 Mar 2014 04:23:46 +0000 (05:23 +0100)]
Merge commit '678082b409aca711f9cf991df6b0200116489322'

* commit '678082b409aca711f9cf991df6b0200116489322':
  X-Bitmap decoder

Conflicts:
Changelog
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
libavcodec/xbmdec.c

See: a0340dfbd78df7639715056937011d2d414aaeed
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '792e4c21f212979f0e29bcdf107cb6b4f51645a4'
Michael Niedermayer [Fri, 28 Mar 2014 03:45:24 +0000 (04:45 +0100)]
Merge commit '792e4c21f212979f0e29bcdf107cb6b4f51645a4'

* commit '792e4c21f212979f0e29bcdf107cb6b4f51645a4':
  xbm: use av_frame_free on close

Conflicts:
libavcodec/xbmenc.c

No change as the buggy code is not part of FFmpeg

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'a7a5e3850ecd94e726ad2272295b9e6c91841cf8'
Michael Niedermayer [Fri, 28 Mar 2014 03:41:16 +0000 (04:41 +0100)]
Merge commit 'a7a5e3850ecd94e726ad2272295b9e6c91841cf8'

* commit 'a7a5e3850ecd94e726ad2272295b9e6c91841cf8':
  fate: add PAF audio and video tests

Conflicts:
tests/fate/audio.mak
tests/fate/video.mak

See: 101615c7ff37afe5e6a951838cbbbb92b7485473
See: 409cc4588329633326b32a5245b085c543689471
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033'
Michael Niedermayer [Fri, 28 Mar 2014 03:31:42 +0000 (04:31 +0100)]
Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033'

* commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033':
  PAF demuxer and decoder

Conflicts:
Changelog
doc/general.texi
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/paf.c
libavcodec/version.h
libavformat/Makefile
libavformat/allformats.c
libavformat/paf.c
libavformat/version.h

See: 7de4a16508cb9bd2d40855f7114dea14329ef62a, and others
Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoMerge commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8'
Michael Niedermayer [Fri, 28 Mar 2014 02:26:43 +0000 (03:26 +0100)]
Merge commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8'

* commit 'd37c96213a2a9e1fd8669122d5405f4ce6a99ed8':
  lavc: restore copy_block{4,16} functions

Conflicts:
libavcodec/copy_block.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
6 years agocmdutils: Mark exit_program as av_noreturn
Luca Barbato [Thu, 27 Mar 2014 23:40:43 +0000 (00:40 +0100)]
cmdutils: Mark exit_program as av_noreturn

6 years agodshow: show device name when outputting buffer overflow log message
rogerdpack [Thu, 27 Mar 2014 19:44:20 +0000 (13:44 -0600)]
dshow: show device name when outputting buffer overflow log message

Signed-off-by: rogerdpack <rogerpack2005@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add a bmpparser test
Vittorio Giovara [Mon, 17 Mar 2014 14:30:05 +0000 (15:30 +0100)]
fate: add a bmpparser test

6 years agobmp: add a standalone parser
Paul B Mahol [Sun, 5 Aug 2012 23:46:41 +0000 (23:46 +0000)]
bmp: add a standalone parser

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agoavcodec/libx264: move where x264opts is applied down so it isnt overridden by avctx...
Michael Niedermayer [Thu, 27 Mar 2014 23:03:38 +0000 (00:03 +0100)]
avcodec/libx264: move where x264opts is applied down so it isnt overridden by avctx & defaults

fixes x264opts opengop=1

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agofate: add XBM tests
Vittorio Giovara [Mon, 17 Mar 2014 00:24:30 +0000 (01:24 +0100)]
fate: add XBM tests

6 years agoX-Bitmap decoder
Vittorio Giovara [Sat, 22 Mar 2014 04:33:27 +0000 (05:33 +0100)]
X-Bitmap decoder

6 years agoxbm: use av_frame_free on close
Vittorio Giovara [Mon, 17 Mar 2014 00:20:53 +0000 (01:20 +0100)]
xbm: use av_frame_free on close

6 years agofate: add PAF audio and video tests
Paul B Mahol [Sun, 8 Jul 2012 22:16:12 +0000 (22:16 +0000)]
fate: add PAF audio and video tests

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
6 years agoPAF demuxer and decoder
Paul B Mahol [Fri, 21 Mar 2014 16:28:47 +0000 (16:28 +0000)]
PAF demuxer and decoder

Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
6 years agolavc: restore copy_block{4,16} functions
Vittorio Giovara [Mon, 10 Mar 2014 16:05:12 +0000 (17:05 +0100)]
lavc: restore copy_block{4,16} functions

They were removed in 9e31729d692f1e721b7ed1a3a0f51b68c064d68f.

6 years agox86: convert DNxHDenc inline asm to yasm
Timothy Gu [Thu, 27 Mar 2014 02:06:30 +0000 (19:06 -0700)]
x86: convert DNxHDenc inline asm to yasm

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agodnxhdenc: make get_pixel_8x4_sym accept ptrdiff_t as stride
Timothy Gu [Thu, 27 Mar 2014 02:06:29 +0000 (19:06 -0700)]
dnxhdenc: make get_pixel_8x4_sym accept ptrdiff_t as stride

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: "Ronald S. Bultje" <rsbultje@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
6 years agoavcodec: Make ff_print_debug_info2() independant of Picture struct
Michael Niedermayer [Thu, 27 Mar 2014 21:14:26 +0000 (22:14 +0100)]
avcodec: Make ff_print_debug_info2() independant of Picture struct

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