diff options
| author | Michael Niedermayer <[email protected]> | 2013-03-02 11:27:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-03-02 11:27:58 +0100 |
| commit | 973dc110ba0ace5ecc57a01b3f6a44d58cd8079c (patch) | |
| tree | 78f3d550ebf1438cef260a321f5d9fb35576a46b /libavcodec/h264.c | |
| parent | 3827734591d8e4a9948f3e57c53e59a549193b9e (diff) | |
| parent | c91c63b5380bf79655c09320774a022f84d76fd5 (diff) | |
Merge commit 'c91c63b5380bf79655c09320774a022f84d76fd5'
* commit 'c91c63b5380bf79655c09320774a022f84d76fd5':
flvdec: Don't read the VP6 header byte when setting codec type based on metadata
Conflicts:
libavformat/flvdec.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'libavcodec/h264.c')
0 files changed, 0 insertions, 0 deletions