Merge commit 'b7040e67ec18259ca634a0e29d98469b3484a87c'

Browse Source

* commit 'b7040e67ec18259ca634a0e29d98469b3484a87c':
  h264: fix AVDISCARD_NONKEY for some interlaced content

Conflicts:
	libavcodec/h264.c

Not merged, the used field is not initialized where it is used

Merged-by: Michael Niedermayer <michael@niedermayer.cc>

...

This commit is contained in:

Michael Niedermayer 2015-07-28 00:27:37 +02:00

parent e1296b5fa4 b7040e67ec

commit ea7e4f8e6a

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

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

Diff Content Not Available