diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 21:28:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-26 21:30:37 +0200 |
| commit | c9083d85df460dd4661cdcd7d70fa7cb7b45a352 (patch) | |
| tree | ca95a300177dbf523080d51133e8d03a14fa43f3 /libavcodec/cpia.c | |
| parent | af75a8559969a0646dc4187e509245f3b5778771 (diff) | |
| parent | 38d044429dabcd28928693240e955c6d4430cca9 (diff) | |
| download | ffmpeg-c9083d85df460dd4661cdcd7d70fa7cb7b45a352.tar.gz | |
Merge commit '38d044429dabcd28928693240e955c6d4430cca9'
* commit '38d044429dabcd28928693240e955c6d4430cca9':
output example: use the new AVFrame API for allocating the video frame
Conflicts:
doc/examples/muxing.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/cpia.c')
0 files changed, 0 insertions, 0 deletions