diff options
| author | Michael Niedermayer <[email protected]> | 2013-11-19 03:48:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-11-19 03:56:53 +0100 |
| commit | 56e122787e7362274b7ac342fde6e303259a5f57 (patch) | |
| tree | 6b87895ea4cc938fea927e5e27ceed77c9519e6a /ffmpeg_filter.c | |
| parent | f0f04fd8429475999bde08943e29a678cab3926e (diff) | |
| parent | a553c6a347d3d28d7ee44c3df3d5c4ee780dba23 (diff) | |
Merge commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23'
* commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23':
lavc: use buf[0] instead of data[0] in checks whether a frame is allocated
Conflicts:
libavcodec/h264_refs.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <[email protected]>
Diffstat (limited to 'ffmpeg_filter.c')
0 files changed, 0 insertions, 0 deletions