Merge commit 'e7fdd6aa0d11c3e144988d7090f972224799e07f' into release/2.2

Browse Source

* commit 'e7fdd6aa0d11c3e144988d7090f972224799e07f':
  avconv: Use the mpeg12 private option scan_offset

Conflicts:
	ffmpeg_opt.c

See: e479013ae4
Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2014-12-20 12:33:31 +01:00

parent c494be6411 e7fdd6aa0d

commit 3cd2c33d36

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available