summaryrefslogtreecommitdiff
path: root/libavformat/mpjpegdec.c
Commit message (Expand)AuthorAge
* Merge commit '8a26ae5f94e613dbf7eb8e3c60462e966e409cdc'Michael Niedermayer2015-06-28
|\
| * mpjpeg: Check stream allocationLuca Barbato2015-06-28
| * mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to failJames Almer2015-06-09
* | mpjpegdec: don't try to alloc an AVIOContext when probe is guaranteed to failJames Almer2015-06-08
* | Merge commit 'caf7be30b11288c498fae67be4741bfbf083d977'Michael Niedermayer2015-06-08
|\|
| * mpjpgdec: free AVIOContext leak on early probe failJanne Grunau2015-06-08
* | mpjpegdec: fix memory leak in probe functionJames Almer2015-06-08
* | Merge commit '9b56ac74b170d12027fbc81f581a451a709f1105'Michael Niedermayer2015-06-08
|/
* mpjpeg: Initial implementationLuca Barbato2015-06-07