generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
62,212 Commits 24 Branches 241 Tags 173 MiB
c1b24ca762
Commit Graph

62212 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Niedermayer
20bc5924a0 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: b6ad5893ce
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-31 01:55:12 +02:00
Michael Niedermayer
36d37edf01 Merge commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3' 
* commit '9bd4a9f4eec8c8843b54126253bb9d77af95bbb3':
  isom: Simplify mov_rewrite_dvd_sub_extradata()

Conflicts:
	libavformat/isom.c

See: f6f3c85c0e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-31 01:44:13 +02:00
Michael Niedermayer
8e8276e0bc Merge commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a' 
* commit '3e4e2142d246699a1a3a0045ba7124b18bc34d7a':
  fate: Convert the paletted output in the brenderpix tests to rgb24

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-31 01:32:02 +02:00
Timothy Gu
09fda6bb50 libmp3lame: add ABR support 2014-03-31 01:11:16 +02:00
Timothy Gu
292dbe5e8a libmp3lame: add comments about CBR/VBR modes 2014-03-31 01:11:16 +02:00
Paul B Mahol
729d821fd8 libmp3lame: allow joint stereo to be disabled 2014-03-31 01:11:16 +02:00
Michael Niedermayer
12789d9636 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
 2014-03-31 01:08:23 +02:00
Michael Niedermayer
fce28c3c6d mov: fill in subtitle dimensions after parsing tkhd 
Sample-Id: NeroRecodeSample.mp4
 2014-03-31 01:08:18 +02:00
Michael Niedermayer
96138e8c8d isom: only write the size if its non zero in mov_rewrite_dvd_sub_extradata() 
Sample-Id: NeroRecodeSample.mp4
 2014-03-31 01:08:12 +02:00
Michael Niedermayer
9bd4a9f4ee isom: Simplify mov_rewrite_dvd_sub_extradata() 
This avoids the 2nd buffer and fixes the palette truncated check
 2014-03-31 01:05:11 +02:00
Martin Storsjö
3e4e2142d2 fate: Convert the paletted output in the brenderpix tests to rgb24 
This makes the output consistent on big-endian systems.
 2014-03-31 01:04:05 +02:00
Matt Oliver
0f2588d7e5 Use intel compliant CDQ instead of CLTD in inline asm. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-30 23:14:36 +02:00
Thilo Borgmann
6d9bdd9d8b doc/indevs: Fix example for QTKit usage. 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-30 21:29:25 +02:00
Michael Niedermayer
9c77e57393 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  avconv: make the ASCII flow charts narrower to fit onto TTY

Conflicts:
	doc/ffmpeg.texi

See: 8fe1076094
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-30 21:20:58 +02:00
Michael Niedermayer
f22d9b1e0b Merge commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d' 
* commit '68e95ab81be1aa3f47ab148dceb8711ef5f4212d':
  dnxhdenc: return meaningful return codes

Conflicts:
	libavcodec/dnxhdenc.c

See: b9bedb0b28
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-30 21:11:01 +02:00
Michael Niedermayer
ce0ec108cd Merge commit '9e4e35b4d7c43a908944183a58aa389a23116fd6' 
* commit '9e4e35b4d7c43a908944183a58aa389a23116fd6':
  avconv_opt: fix avio_open2() return code check

See: 774239be71
Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-30 21:00:14 +02:00
Vadim Kalinsky
234f0bcb0c lavd: Add QTKit input device. 
Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-30 20:45:07 +02:00
Timothy Gu
3a5a965493 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>
 2014-03-30 18:02:14 +02:00
Peter Ross
92d657b5f1 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>
 2014-03-30 16:36:47 +02:00
Peter Ross
e61973db6c 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>
 2014-03-30 16:36:22 +02:00
Michael Niedermayer
7aa3979b8c 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>
 2014-03-30 15:00:03 +02:00
Michael Niedermayer
d9a3501c33 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>
 2014-03-30 15:00:03 +02:00
Timothy Gu
68e95ab81b dnxhdenc: return meaningful return codes 2014-03-30 14:55:09 +02:00
Timothy Gu
9e4e35b4d7 avconv_opt: fix avio_open2() return code check 
avio_open2() only return < 0 when error.
 2014-03-30 14:55:08 +02:00
Peter Ross
31ac3f306c 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>
 2014-03-30 06:22:54 +02:00
Peter Ross
73a2d16bfa avformat/wtvdec: demux mpeg2 extradata 
Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-30 06:22:50 +02:00
Michael Niedermayer
c01ddf845d avformat/replaygain: remove unused variable 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-30 03:23:13 +02:00
Michael Niedermayer
30e159366e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  golomb: Fix the implementation of get_se_golomb_long

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-30 03:03:28 +02:00
Michael Niedermayer
ae3313e154 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>
 2014-03-30 01:55:31 +01:00
Martin Storsjö
508a84e672 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>
 2014-03-30 00:28:27 +02:00
Clément Bœsch
af3b6aed0d avcodec/vp9dsp: fix typo in mc doxy. 2014-03-29 18:13:15 +01:00
Clément Bœsch
c4148a6668 x86/vp9mc: add vp9 namespace. 2014-03-29 18:13:15 +01:00
Michael Niedermayer
bcd5fd5346 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>
 2014-03-29 17:07:26 +01:00
Vittorio Giovara
53c20f17c7 vp8: K&R formatting cosmetics 
Signed-off-by: Diego Biurrun <diego@biurrun.de>
 2014-03-29 16:11:09 +01:00
Michael Niedermayer
8a9d0a1561 avformat/movenc: fix if vs if else 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-29 15:38:20 +01:00
Michael Niedermayer
b8f5b0713e Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  movenc: Add dvd subtitle support

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-29 15:04:56 +01:00
Michael Niedermayer
d840266633 Merge commit '85698be461c07be10d873dd34348bcfe9ffc56e0' 
* commit '85698be461c07be10d873dd34348bcfe9ffc56e0':
  cmdutils: Mark exit_program as av_noreturn

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-29 14:33:39 +01:00
Lukasz Marek
3937b40e87 lavd/pulse_audio_enc: implement get_device_list callback 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-03-29 09:54:16 +01:00
Lukasz Marek
255cf03af8 lavd/pulse_audio_dec: implement get_device_list callback 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-03-29 09:54:09 +01:00
Lukasz Marek
85ed32d2ed lavd/pulse_audio_common: add device detecting code 
Signed-off-by: Lukasz Marek <lukasz.m.luki@gmail.com>
 2014-03-29 09:48:56 +01:00
Lukasz Marek
cd50a44beb 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>
 2014-03-29 09:48:48 +01:00
Lukasz Marek
27256e69ab 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>
 2014-03-29 09:26:10 +01:00
Lukasz Marek
fd786bad63 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>
 2014-03-29 09:25:14 +01:00
Michael Niedermayer
46f72ea507 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>
 2014-03-29 04:27:00 +01:00
Michael Niedermayer
067ada04d1 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>
 2014-03-29 03:50:25 +01:00
Michael Niedermayer
657cee1aef avformat/img2_alias_pix: rewrite probe function 
Fixes probetest failure

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-29 00:38:51 +01:00
Michael Niedermayer
2cffdcbdd7 avformat/img2dec: try to read PROBE_BUF_MIN instead of just enough for .pix probing 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-29 00:38:51 +01:00
Michael Niedermayer
1c13e1ef36 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>
 2014-03-28 23:54:51 +01:00
Michael Niedermayer
075d6c066b avformat: add image2 brender pix demuxer 
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-28 23:54:51 +01:00
Michael Niedermayer
13bcb4de33 avformat: add image2 alias pix demuxer 
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
 2014-03-28 23:54:51 +01:00