diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-07 00:18:22 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-07 00:18:22 +0100 |
| commit | fa3a7b55ec1be2a5274d7349d3aa1faed14d2bcb (patch) | |
| tree | 4d361e7dfeb04cb0684a355d13bfe06d60ad529b /ffmpeg_filter.c | |
| parent | ff9b607489e6b295d57b9b97f1c23b0a66b273a6 (diff) | |
| parent | 5da51284937649a8ebb84fa951c235438fcbf8ae (diff) | |
Merge commit '5da51284937649a8ebb84fa951c235438fcbf8ae'
* commit '5da51284937649a8ebb84fa951c235438fcbf8ae':
cavs: Add a dependency on h264chroma
lavc: Split out ff_hwaccel_pixfmt_list_420[] over individual codecs
Conflicts:
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpeg12.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions