diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 15:08:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 15:08:17 +0100 |
| commit | 6e57d2da9058fcb0eefedf5102321a044d51e6dc (patch) | |
| tree | e82b054777bafd5d12b2c04f6a27c6cf1daa3519 /libavformat/pjsdec.c | |
| parent | 3d0411707839d3af1f34e0a8c7c8cbe4dd02b1ba (diff) | |
| parent | 9404a47a2d1df418946a338938eb6cdb3afed474 (diff) | |
| download | ffmpeg-6e57d2da9058fcb0eefedf5102321a044d51e6dc.tar.gz | |
Merge commit '9404a47a2d1df418946a338938eb6cdb3afed474'
* commit '9404a47a2d1df418946a338938eb6cdb3afed474':
h264: move parser-only variables to their own context
Conflicts:
libavcodec/h264_parser.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/pjsdec.c')
0 files changed, 0 insertions, 0 deletions