diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 03:36:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-07 03:59:22 +0200 |
| commit | 0ecb3075c1c243cfb656d1cbe0b19cdb91bde659 (patch) | |
| tree | 87e3c08e6648a58a743f58e532bdfdd0f0019b4e /libavcodec/h261dec.c | |
| parent | a7a82f2f22afaac9155ef46b8ff274ad4573b20e (diff) | |
| parent | e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a (diff) | |
| download | ffmpeg-0ecb3075c1c243cfb656d1cbe0b19cdb91bde659.tar.gz | |
Merge commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a'
* commit 'e10fd08aa7fbe8645545ad2e8721f0ed03c8e06a':
h264: Refactor decode_nal_units
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h261dec.c')
0 files changed, 0 insertions, 0 deletions