diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 13:53:02 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 13:53:02 +0100 |
| commit | a62fced394825101b202a8bc6055e4932b371089 (patch) | |
| tree | 647ad84aa19de5f35ce6022120db0404f661b760 /libavformat/smjpegdec.c | |
| parent | bb3823d457104d883a81ee332a005ad42e80409f (diff) | |
| parent | 202c2acc40a6de8758b44ab3f5c85ab250079734 (diff) | |
| download | ffmpeg-a62fced394825101b202a8bc6055e4932b371089.tar.gz | |
Merge commit '202c2acc40a6de8758b44ab3f5c85ab250079734'
* commit '202c2acc40a6de8758b44ab3f5c85ab250079734':
vda: remove async decoder leftovers
Conflicts:
libavcodec/vda_h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/smjpegdec.c')
0 files changed, 0 insertions, 0 deletions